From 1d9058dd9741529850d0f9c6b679b1a759a03fef Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期五, 09 十一月 2018 15:13:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt     |    2 +-
 db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt |    1 -
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt b/db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt
index d0e72e6..3d57e10 100644
--- a/db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt
@@ -14,7 +14,6 @@
 145	
 93	{"1":[[5410,1]],"2":[[5410,1]],"3":[[5410,1]]}
 138	{"1":[[8353,2]],"2":[[8353,2]],"3":[[8353,2]]}
-28	{"1":[[966,1]],"2":[[966,1]],"3":[[966,1]]}
 103	
 140	
 141	
diff --git a/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt b/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
index d254a2f..0afd8f7 100644
--- a/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
+++ b/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
@@ -13,7 +13,7 @@
 12	0	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000
 13	3	4	5	6	10	11	12	15	16	17	20	20	22	24	26	28
 14	2	3	4	5	8	9	10	13	14	15	20	16	18	20	22	24
-15	0	0	0	1	2	3	3	4	4	4	4	9	10	11	12	12
+15	0	0	0	1	2	2	3	3	4	4	4	9	10	11	12	12
 16	0	0	1	1	1	2	2	2	3	3	4	5	6	6	6	6
 17	1	1	2	2	3	3	4	4	4	4	4	4	4	4	4	4
 18	0	0	0	0	1	1	2	2	2	2	2	2	2	2	2	2

--
Gitblit v1.8.0