From 30b27c5d6f867ed6e890f64a56cf89825908ba88 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期二, 13 十一月 2018 10:28:05 +0800
Subject: [PATCH] Merge branch '1.2' of http://192.168.0.87:10010/r/snxx_server into 1.2

---
 db/PyMongoDataServer/PySysDB/tagOrderInfo.txt |  116 ++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 89 insertions(+), 27 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
index 805a9b5..6c7a830 100644
--- a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
@@ -8,6 +8,7 @@
 snqxz.328	424064855	328	107	0
 snqxz.648	424064855	648	108	0
 snqxz.1	424064855	1	110	0
+snqxz.0.1	424064855	0.1	210	0
 lxj.18	226114725	18	101	0
 lxj.10	226114725	10	102	0
 lxj.30	226114725	30	103	0
@@ -116,6 +117,7 @@
 sgsbl.328	815035927	328	107	0
 sgsbl.648	815035927	648	108	0
 sgsbl.1	815035927	1	110	0
+sgsbl.0.1	815035927	0.1	210	0
 sgsbl.ios.6	815035927	6	0	2
 sgsbl.ios.30	815035927	30	0	4
 sgsbl.ios.68	815035927	68	0	5
@@ -165,20 +167,20 @@
 jkjk.68	mrgameios	68	0	5
 jkjk.128	mrgameios	128	0	7
 jkjk.168	mrgameios	168	0	8
-com.price18.xjlb	spyxxjios	18	101	0
-com.price6.xj	spyxxjios	6	2	0
-com.price30.xj	spyxxjios	30	103	0
-com.price98.xj	spyxxjios	98	104	0
-com.price128.xj	spyxxjios	128	105	0
-com.price198.xj	spyxxjios	198	106	0
-com.price328.xj	spyxxjios	328	107	0
-com.price648.xj	spyxxjios	648	108	0
+com.price18.xylb	spyxxjios	18	101	0
+com.price6.xyxz	spyxxjios	6	2	0
+com.price30.xyxz	spyxxjios	30	103	0
+com.price98.xzxz	spyxxjios	98	104	0
+com.price128.xyxz	spyxxjios	128	105	0
+com.price198.xyxz	spyxxjios	198	106	0
+com.price328.xyxz	spyxxjios	328	107	0
+com.price648.xyxz	spyxxjios	648	108	0
 com.price1.xj	spyxxjios	1	110	0
-com.price6.xjlb	spyxxjios	6	0	2
-com.price30.xjlb	spyxxjios	30	0	4
-com.price68.xjlb	spyxxjios	68	0	5
-com.price128.xjlb	spyxxjios	128	0	7
-com.price168.xjlb	spyxxjios	168	0	8
+com.price6.xylb	spyxxjios	6	0	2
+com.price30.xylb	spyxxjios	30	0	4
+com.price68.xylb	spyxxjios	68	0	5
+com.price128.xylb	spyxxjios	128	0	7
+com.price168.xylb	spyxxjios	168	0	8
 jisu.18	jisugame	18	101	0
 jisu.10	jisugame	10	102	0
 jisu.30	jisugame	30	103	0
@@ -194,17 +196,77 @@
 jisu.android.68	jisugame	68	0	5
 jisu.android.128	jisugame	128	0	7
 jisu.android.168	jisugame	168	0	8
-jisu.18	jisugameios	18	101	0
-jisu.6	jisugameios	6	2	0
-jisu.30	jisugameios	30	103	0
-jisu.98	jisugameios	98	104	0
-jisu.128	jisugameios	128	105	0
-jisu.198	jisugameios	198	106	0
-jisu.328	jisugameios	328	107	0
-jisu.648	jisugameios	648	108	0
-jisu.1	jisugameios	1	110	0
-jisu.ios.6	jisugameios	6	0	2
-jisu.ios.30	jisugameios	30	0	4
-jisu.ios.68	jisugameios	68	0	5
-jisu.ios.128	jisugameios	128	0	7
-jisu.ios.168	jisugameios	168	0	8
+com.snjjxios.01	jisugameios	18	101	0
+com.snjjxios.02	jisugameios	6	2	0
+com.snjjxios.03	jisugameios	30	103	0
+com.snjjxios.04	jisugameios	98	104	0
+com.snjjxios.05	jisugameios	128	105	0
+com.snjjxios.06	jisugameios	198	106	0
+com.snjjxios.07	jisugameios	328	107	0
+com.snjjxios.08	jisugameios	648	108	0
+com.snjjxios.14	jisugameios	1	110	0
+com.snjjxios.09	jisugameios	6	0	2
+com.snjjxios.10	jisugameios	30	0	4
+com.snjjxios.11	jisugameios	68	0	5
+com.snjjxios.12	jisugameios	128	0	7
+com.snjjxios.13	jisugameios	168	0	8
+wx.snqxz.18	424064855	18	201	0
+wx.snqxz.6	424064855	6	202	0
+wx.snqxz.30	424064855	30	203	0
+wx.snqxz.98	424064855	98	204	0
+wx.snqxz.128	424064855	128	205	0
+wx.snqxz.198	424064855	198	206	0
+wx.snqxz.328	424064855	328	207	0
+wx.snqxz.648	424064855	648	208	0
+wx.snqxz.01	424064855	0.1	211	0
+wx.sgsbl.18	815035927	18	201	0
+wx.sgsbl.6	815035927	6	202	0
+wx.sgsbl.30	815035927	30	203	0
+wx.sgsbl.98	815035927	98	204	0
+wx.sgsbl.128	815035927	128	205	0
+wx.sgsbl.198	815035927	198	206	0
+wx.sgsbl.328	815035927	328	207	0
+wx.sgsbl.648	815035927	648	208	0
+wx.sgsbl.01	815035927	0.1	211	0
+com.price18.snxzlb	spyxxzios	18	101	0
+com.price6.snxz	spyxxzios	6	2	0
+com.price30.snxz	spyxxzios	30	103	0
+com.price98.snxz	spyxxzios	98	104	0
+com.price128.snxz	spyxxzios	128	105	0
+com.price198.snxz	spyxxzios	198	106	0
+com.price328.snxz	spyxxzios	328	107	0
+com.price648.snxz	spyxxzios	648	108	0
+com.price1.snxz	spyxxzios	1	110	0
+com.price6.snxzlb	spyxxzios	6	0	2
+com.price30.snxzlb	spyxxzios	30	0	4
+com.price68.snxzlb	spyxxzios	68	0	5
+com.price128.snxzlb	spyxxzios	128	0	7
+com.price168.snxzlb	spyxxzios	168	0	8
+com.snyjjpg.01	jisusnyjjios	18	101	0
+com.snyjjpg.02	jisusnyjjios	6	2	0
+com.snyjjpg.03	jisusnyjjios	30	103	0
+com.snyjjpg.04	jisusnyjjios	98	104	0
+com.snyjjpg.05	jisusnyjjios	128	105	0
+com.snyjjpg.06	jisusnyjjios	198	106	0
+com.snyjjpg.07	jisusnyjjios	328	107	0
+com.snyjjpg.08	jisusnyjjios	648	108	0
+com.snyjjpg.test1	jisusnyjjios	1	110	0
+com.snyjjpg.09	jisusnyjjios	6	0	2
+com.snyjjpg.10	jisusnyjjios	30	0	4
+com.snyjjpg.11	jisusnyjjios	68	0	5
+com.snyjjpg.12	jisusnyjjios	128	0	7
+com.snyjjpg.13	jisusnyjjios	168	0	8
+mbxml.18	1030013326	18	101	0
+mbxml.6	1030013326	6	2	0
+mbxml.30	1030013326	30	103	0
+mbxml.98	1030013326	98	104	0
+mbxml.128	1030013326	128	105	0
+mbxml.198	1030013326	198	106	0
+mbxml.328	1030013326	328	107	0
+mbxml.648	1030013326	648	108	0
+mbxml.ios.test1	1030013326	1	110	0
+mbxml.ios.6	1030013326	6	0	2
+mbxml.ios.30	1030013326	30	0	4
+mbxml.ios.68	1030013326	68	0	5
+mbxml.ios.128	1030013326	128	0	7
+mbxml.ios.168	1030013326	168	0	8

--
Gitblit v1.8.0