From d4881a7997804784ac59b48a954ed2df67e445f5 Mon Sep 17 00:00:00 2001
From: cehua_hzl <648597270@qq.com>
Date: 星期二, 04 九月 2018 14:59:39 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
index 9e96ba5..a13acac 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
@@ -1,9 +1,9 @@
-CfgID	StartDate	EndDate	StartTime	EndTime	LimitLV	IsDayReset	GiftbagList
-1	2018-5-1	2018-5-2	12:00|18:00	13:00|19:00	50	1	[[1,2],[2,3]]
-2	2018-10-1	2018-10-3			50	1	[[1,2,3]]
-3	2018-10-1	2018-10-3			50	0	[[3]]
-4	2018-8-4	2018-8-4			50	1	[[1]]
-5	2018-8-6	2018-8-6			50	1	[[2]]
-6	2018-8-8	2018-8-8			180	1	[[3]]
-7	2018-8-10	2018-8-10			280	1	[[4]]
-8	2018-8-12	2018-8-12			50	1	[[1]]
+CfgID	StartDate	EndDate	StartTime	EndTime	LimitLV	IsDayReset	GiftbagList
+1	2018-5-1	2018-5-2	12:00|18:00	13:00|19:00	50	1	[[1,2],[2,3]]
+2	2018-10-1	2018-10-3			50	1	[[1,2,3]]
+3	2018-10-1	2018-10-3			50	0	[[3]]
+4	2018-8-4	2018-8-4			50	1	[[1]]
+5	2018-8-6	2018-8-6			50	1	[[2]]
+6	2018-8-8	2018-8-8			180	1	[[3]]
+7	2018-8-10	2018-8-10			280	1	[[4]]
+8	2018-8-12	2018-8-12			50	1	[[5]]

--
Gitblit v1.8.0