From fe14b23fbeec80bf5f2f1e6e36408dcdfcf65786 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期二, 28 八月 2018 17:18:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 3 +++
db/PyMongoDataServer/PySysDB/tagInvest.txt | 30 +++++++++++++++---------------
db/PyMongoDataServer/PySysDB/tagOrderInfo.txt | 17 +++++++++++++++++
3 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index a130172..3fb8b7c 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -130,3 +130,6 @@
2343 0 181_38
2344 0 181_100
2345 0 201_1
+2346 0 [[5000,[3504,1]],[10000,[3514,1]]] 1
+2347 0 [[5000,[3505,1]],[10000,[3515,1]]] 1
+2348 0 [[5000,[3506,1]],[10000,[3516,1]]] 1
diff --git a/db/PyMongoDataServer/PySysDB/tagInvest.txt b/db/PyMongoDataServer/PySysDB/tagInvest.txt
index 111e73b..1083aa3 100644
--- a/db/PyMongoDataServer/PySysDB/tagInvest.txt
+++ b/db/PyMongoDataServer/PySysDB/tagInvest.txt
@@ -59,18 +59,18 @@
227 2 27 0 {"1":[[4010,2,1],[105,1,1],[3512,1,1]],"2":[[4010,2,1],[105,1,1],[3512,1,1]],"3":[[4010,2,1],[105,1,1],[3512,1,1]]}
228 2 28 0 {"1":[[4010,2,1],[105,1,1],[3513,1,1]],"2":[[4010,2,1],[105,1,1],[3513,1,1]],"3":[[4010,2,1],[105,1,1],[3513,1,1]]}
301 3 0 0 {"1":[[30,300,0]], "2":[[30,680,0]], "3":[[30,1280,0]], "4":[[30,1880,0]]}
-302 3 0 150 {"1":[[30,100,0]], "2":[[30,220,0]], "3":[[30,420,0]], "4":[[30,620,0]]}
-303 3 0 160 {"1":[[30,120,0]], "2":[[30,250,0]], "3":[[30,480,0]], "4":[[30,700,0]]}
-304 3 0 170 {"1":[[30,130,0]], "2":[[30,280,0]], "3":[[30,530,0]], "4":[[30,780,0]]}
-305 3 0 180 {"1":[[30,140,0]], "2":[[30,310,0]], "3":[[30,580,0]], "4":[[30,850,0]]}
-306 3 0 190 {"1":[[30,150,0]], "2":[[30,335,0]], "3":[[30,630,0]], "4":[[30,920,0]]}
-307 3 0 200 {"1":[[30,160,0]], "2":[[30,360,0]], "3":[[30,680,0]], "4":[[30,990,0]]}
-308 3 0 210 {"1":[[30,170,0]], "2":[[30,385,0]], "3":[[30,730,0]], "4":[[30,1060,0]]}
-309 3 0 225 {"1":[[30,180,0]], "2":[[30,410,0]], "3":[[30,775,0]], "4":[[30,1130,0]]}
-310 3 0 240 {"1":[[30,190,0]], "2":[[30,435,0]], "3":[[30,820,0]], "4":[[30,1200,0]]}
-311 3 0 255 {"1":[[30,200,0]], "2":[[30,460,0]], "3":[[30,865,0]], "4":[[30,1270,0]]}
-312 3 0 270 {"1":[[30,210,0]], "2":[[30,485,0]], "3":[[30,910,0]], "4":[[30,1340,0]]}
-313 3 0 285 {"1":[[30,220,0]], "2":[[30,510,0]], "3":[[30,955,0]], "4":[[30,1410,0]]}
-314 3 0 300 {"1":[[30,230,0]], "2":[[30,535,0]], "3":[[30,1000,0]], "4":[[30,1480,0]]}
-315 3 0 315 {"1":[[30,240,0]], "2":[[30,560,0]], "3":[[30,1045,0]], "4":[[30,1550,0]]}
-316 3 0 330 {"1":[[30,260,0]], "2":[[30,585,0]], "3":[[30,1100,0]], "4":[[30,1620,0]]}
+302 3 0 120 {"1":[[30,100,0]], "2":[[30,220,0]], "3":[[30,420,0]], "4":[[30,620,0]]}
+303 3 0 130 {"1":[[30,120,0]], "2":[[30,250,0]], "3":[[30,480,0]], "4":[[30,700,0]]}
+304 3 0 140 {"1":[[30,130,0]], "2":[[30,280,0]], "3":[[30,530,0]], "4":[[30,780,0]]}
+305 3 0 150 {"1":[[30,140,0]], "2":[[30,310,0]], "3":[[30,580,0]], "4":[[30,850,0]]}
+306 3 0 160 {"1":[[30,150,0]], "2":[[30,335,0]], "3":[[30,630,0]], "4":[[30,920,0]]}
+307 3 0 170 {"1":[[30,160,0]], "2":[[30,360,0]], "3":[[30,680,0]], "4":[[30,990,0]]}
+308 3 0 180 {"1":[[30,170,0]], "2":[[30,385,0]], "3":[[30,730,0]], "4":[[30,1060,0]]}
+309 3 0 195 {"1":[[30,180,0]], "2":[[30,410,0]], "3":[[30,775,0]], "4":[[30,1130,0]]}
+310 3 0 210 {"1":[[30,190,0]], "2":[[30,435,0]], "3":[[30,820,0]], "4":[[30,1200,0]]}
+311 3 0 225 {"1":[[30,200,0]], "2":[[30,460,0]], "3":[[30,865,0]], "4":[[30,1270,0]]}
+312 3 0 240 {"1":[[30,210,0]], "2":[[30,485,0]], "3":[[30,910,0]], "4":[[30,1340,0]]}
+313 3 0 255 {"1":[[30,220,0]], "2":[[30,510,0]], "3":[[30,955,0]], "4":[[30,1410,0]]}
+314 3 0 270 {"1":[[30,230,0]], "2":[[30,535,0]], "3":[[30,1000,0]], "4":[[30,1480,0]]}
+315 3 0 285 {"1":[[30,240,0]], "2":[[30,560,0]], "3":[[30,1045,0]], "4":[[30,1550,0]]}
+316 3 0 300 {"1":[[30,260,0]], "2":[[30,585,0]], "3":[[30,1100,0]], "4":[[30,1620,0]]}
diff --git a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
index 7d0641d..782adfd 100644
--- a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
@@ -86,3 +86,20 @@
snxxz.Android.98.b 822055139 98 0 6
snxxz.Android.128.a 822055139 128 0 7
snxxz.Android.168.a 822055139 168 0 8
+snxxz.ios.18 828115704 18 101 0
+snxxz.ios.6 828115704 6 2 0
+snxxz.ios.30 828115704 30 103 0
+snxxz.ios.98 828115704 98 104 0
+snxxz.ios.128 828115704 128 105 0
+snxxz.ios.198 828115704 198 106 0
+snxxz.ios.328 828115704 328 107 0
+snxxz.ios.648 828115704 648 108 0
+snxxz.ios.01 828115704 1 110 0
+snxxz.ios.1.a 828115704 1 0 1
+snxxz.ios.6.a 828115704 6 0 2
+snxxz.ios.6.b 828115704 6 0 3
+snxxz.ios.30.a 828115704 30 0 4
+snxxz.ios.68.a 828115704 68 0 5
+snxxz.ios.98.b 828115704 98 0 6
+snxxz.ios.128.a 828115704 128 0 7
+snxxz.ios.168.a 828115704 168 0 8
--
Gitblit v1.8.0