From 8b32ad7483685185226d751c0963ac30625bf497 Mon Sep 17 00:00:00 2001
From: CeHua_ZWJ <ceh@163.com>
Date: 星期五, 07 九月 2018 21:11:08 +0800
Subject: [PATCH] Merge branch '1.0.15' of http://192.168.0.87:10010/r/snxx_server into 1.0.15

---
 db/PyMongoDataServer/PySysDB/tagOrderInfo.txt |  144 ++++++++++++++++++++++++++++++-----------------
 1 files changed, 91 insertions(+), 53 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
index f8dd731..30f40a8 100644
--- a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
@@ -7,6 +7,7 @@
 snqxz.198	424064855	198	106	0
 snqxz.328	424064855	328	107	0
 snqxz.648	424064855	648	108	0
+snqxz.1	424064855	1	110	0
 lxj.18	226114725	18	101	0
 lxj.10	226114725	10	102	0
 lxj.30	226114725	30	103	0
@@ -16,56 +17,93 @@
 lxj.328	226114725	328	107	0
 lxj.648	226114725	648	108	0
 lxj.3000	226114725	3000	109	0
-lxj.01	226114725	1	110	0
-sn.ios.1.a	424064855	1	0	1
-sn.ios.6.a	424064855	6	0	2
-sn.ios.6.b	424064855	6	0	3
-sn.ios.30.a	424064855	30	0	4
-sn.ios.68.a	424064855	68	0	5
-sn.ios.98.b	424064855	98	0	6
-sn.ios.128.a	424064855	128	0	7
-sn.ios.168.a	424064855	168	0	8
-sn.android.1.a	226114725	1	0	1
-sn.android.6.a	226114725	6	0	2
-sn.android.6.b	226114725	6	0	3
-sn.android.30.a	226114725	30	0	4
-sn.android.68.a	226114725	68	0	5
-sn.android.98.b	226114725	98	0	6
-sn.android.128.a	226114725	128	0	7
-sn.android.168.a	226114725	168	0	8
-lxj.ios.18	508021130	18	101	0
-lxj.ios.6	508021130	6	2	0
-lxj.ios.30	508021130	30	103	0
-lxj.ios.98	508021130	98	104	0
-lxj.ios.128	508021130	128	105	0
-lxj.ios.198	508021130	198	106	0
-lxj.ios.328	508021130	328	107	0
-lxj.ios.648	508021130	648	108	0
-lxj.ios.3000	508021130	3000	109	0
-lxj.ios.01	508021130	1	110	0
-lxj.ios.1.a	508021130	1	0	1
-lxj.ios.6.a	508021130	6	0	2
-lxj.ios.6.b	508021130	6	0	3
-lxj.ios.30.a	508021130	30	0	4
-lxj.ios.68.a	508021130	68	0	5
-lxj.ios.98.b	508021130	98	0	6
-lxj.ios.128.a	508021130	128	0	7
-lxj.ios.168.a	508021130	168	0	8
-lxj.Android.18	813015059	18	101	0
-lxj.Android.10	813015059	10	102	0
-lxj.Android.30	813015059	30	103	0
-lxj.Android.98	813015059	98	104	0
-lxj.Android.128	813015059	128	105	0
-lxj.Android.198	813015059	198	106	0
-lxj.Android.328	813015059	328	107	0
-lxj.Android.648	813015059	648	108	0
-lxj.Android.3000	813015059	3000	109	0
-lxj.Android.01	813015059	1	110	0
-lxj.Android.1.a	813015059	1	0	1
-lxj.Android.6.a	813015059	6	0	2
-lxj.Android.6.b	813015059	6	0	3
-lxj.Android.30.a	813015059	30	0	4
-lxj.Android.68.a	813015059	68	0	5
-lxj.Android.98.b	813015059	98	0	6
-lxj.Android.128.a	813015059	128	0	7
-lxj.Android.168.a	813015059	168	0	8
+lxj.1	226114725	1	110	0
+snqxz.ios.6	424064855	6	0	2
+snqxz.ios.30	424064855	30	0	4
+snqxz.ios.68	424064855	68	0	5
+snqxz.ios.98	424064855	98	0	6
+snqxz.ios.128	424064855	128	0	7
+snqxz.ios.168	424064855	168	0	8
+sn.android.6	226114725	6	0	2
+sn.android.30	226114725	30	0	4
+sn.android.68	226114725	68	0	5
+sn.android.98	226114725	98	0	6
+sn.android.128	226114725	128	0	7
+sn.android.168	226114725	168	0	8
+lxj.18	508021130	18	101	0
+lxj.6	508021130	6	2	0
+lxj.30	508021130	30	103	0
+lxj.98	508021130	98	104	0
+lxj.128	508021130	128	105	0
+lxj.198	508021130	198	106	0
+lxj.328	508021130	328	107	0
+lxj.648	508021130	648	108	0
+lxj.1	508021130	1	110	0
+lxj.ios.6	508021130	6	0	2
+lxj.ios.30	508021130	30	0	4
+lxj.ios.68	508021130	68	0	5
+lxj.ios.98	508021130	98	0	6
+lxj.ios.128	508021130	128	0	7
+lxj.ios.168	508021130	168	0	8
+lxj.18	813015059	18	101	0
+lxj.10	813015059	10	102	0
+lxj.30	813015059	30	103	0
+lxj.98	813015059	98	104	0
+lxj.128	813015059	128	105	0
+lxj.198	813015059	198	106	0
+lxj.328	813015059	328	107	0
+lxj.648	813015059	648	108	0
+lxj.3000	813015059	3000	109	0
+lxj.1	813015059	1	110	0
+lxj.android.6	813015059	6	0	2
+lxj.android.30	813015059	30	0	4
+lxj.android.68	813015059	68	0	5
+lxj.android.98	813015059	98	0	6
+lxj.android.128	813015059	128	0	7
+lxj.android.168	813015059	168	0	8
+snxxz.18	822055139	18	101	0
+snxxz.10	822055139	10	102	0
+snxxz.30	822055139	30	103	0
+snxxz.98	822055139	98	104	0
+snxxz.128	822055139	128	105	0
+snxxz.198	822055139	198	106	0
+snxxz.328	822055139	328	107	0
+snxxz.648	822055139	648	108	0
+snxxz.3000	822055139	3000	109	0
+snxxz.1	822055139	1	110	0
+snxxz.android.6	822055139	6	0	2
+snxxz.android.30	822055139	30	0	4
+snxxz.android.68	822055139	68	0	5
+snxxz.android.98	822055139	98	0	6
+snxxz.android.128	822055139	128	0	7
+snxxz.android.168	822055139	168	0	8
+snxxz.18	828115704	18	101	0
+snxxz.6	828115704	6	2	0
+snxxz.30	828115704	30	103	0
+snxxz.98	828115704	98	104	0
+snxxz.128	828115704	128	105	0
+snxxz.198	828115704	198	106	0
+snxxz.328	828115704	328	107	0
+snxxz.648	828115704	648	108	0
+snxxz.1	828115704	1	110	0
+snxxz.ios.6	828115704	6	0	2
+snxxz.ios.30	828115704	30	0	4
+snxxz.ios.68	828115704	68	0	5
+snxxz.ios.98	828115704	98	0	6
+snxxz.ios.128	828115704	128	0	7
+snxxz.ios.168	828115704	168	0	8
+575	498mrgame	18	101	0
+576	498mrgame	10	102	0
+577	498mrgame	30	103	0
+578	498mrgame	98	104	0
+579	498mrgame	128	105	0
+580	498mrgame	198	106	0
+581	498mrgame	328	107	0
+582	498mrgame	648	108	0
+583	498mrgame	3000	109	0
+584	498mrgame	1	110	0
+570	498mrgame	6	0	2
+571	498mrgame	30	0	4
+572	498mrgame	68	0	5
+573	498mrgame	128	0	7
+574	498mrgame	168	0	8

--
Gitblit v1.8.0