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 |   42 ++++++++++++++++++++++++++++--------------
 1 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
index f33cc94..6c7a830 100644
--- a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
@@ -242,17 +242,31 @@
 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
+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