From 97b66e70ea280081bc372137434a56d52d5c72c8 Mon Sep 17 00:00:00 2001
From: cehua_lyf <1251614069@qq.com>
Date: 星期三, 30 一月 2019 14:14:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagFBLine.txt |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index d6b00e3..b3862dc 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
@@ -3,6 +3,7 @@
 31020	0	31020	0	0	0	0	0	0	0	0	0	[49,71]	12			
 31020	1	31030	0	0	0	0	0	0	0	0	0	[55,14]	12			
 31020	2	31031	0	0	0	0	0	0	0	0	0	[97,42]	12			
+31020	3	31360	0	0	0	0	0	0	0	0	0	[53,170]	12			
 31040	0	31040	0	0	0	0	0	0	0	0	0	[59,19]	[1,3,300,10]	[[201,30102001,5,15,500,0,0],[202,30102002,4,8,100,0,0],[203,30102003,1,2,100,0,0]]		
 31040	1	31040	0	0	0	0	0	0	0	0	0	[60,54]	[0,3,300,10]	[[210,30102004,1,1,1,1,0]]		
 31040	2	31040	0	0	0	0	0	0	0	0	0	[60,54]	[0,3,300,10]	[[210,30102005,1,1,1,1,0]]		
@@ -53,7 +54,7 @@
 31190	4	31190	200	500	0	0	0	0	120	0	0	[24,3]	[3,480,10,5,15]	[[(101,30201004,2),(102,30201014,1),(105,30201024,1),(103,30201004,2)], [(104,30203004,1)]]		[(4151,8,9),(1142,1,1)]
 31190	5	31190	230	500	0	0	0	0	120	0	0	[24,3]	[3,480,10,5,15]	[[(101,30201005,2),(102,30201015,1),(105,30201025,1),(103,30201005,2)], [(104,30203005,1)]]		[(4151,10,11),(1142,1,1)]
 31220	0	31220	110	0	0	0	0	0	0	0	0	[12,23]				
-31230	0	31230	0	0	0	0	0	0	0	0	0	[12,6]	[900,[30,20,10,9,8,7,6,5,4,3,2,1]]			
+31230	0	31230	0	0	0	0	0	0	0	0	0	[12,6]	[1200,[30,20,10,9,8,7,6,5,4,3,2,1]]			
 31240	0	31240	0	0	0	4010	2	80	0	0	0	[32,16]	[3,1800,15,101]			
 51010	0	51010	155	500	0	0	0	0	0	0	0	[24,20,3]	[3,360,10]	[{5101011:1},{5101012:1},{5101013:1},{5101014:1}]	[60,40,40,20,20]	[793536, [141,45]]
 51010	1	51010	155	500	0	0	0	0	0	0	0	[70,19,3]	[3,360,10]	[{5101021:1},{5101022:1},{5101023:1},{5101024:1}]	[60,40,40,20,20]	[831840, [141,36], [142,6]]
@@ -100,3 +101,14 @@
 32010	2	32012	150	0	0	0	0	0	0	0	0	[26,6]	[180,3,10]			
 32010	3	32013	150	0	0	0	0	0	0	0	0	[26,6]	[180,3,10]			
 32010	4	32014	150	0	0	0	0	0	0	0	0	[26,6]	[180,3,10]			
+31370	0	31370	0	500	0	0	0	0	0	0	0	[18,18]	[3,180,10, [179,178,120,60]]	101		
+31380	0	31380	235	0	0	0	0	0	0	0	0	[17,19,8]	10			[[5414,2,1],[1158,1,1],[5500,3,1]]
+31380	1	31380	300	0	0	0	0	0	0	0	0	[17,19,8]	10			[[5414,2,1],[1158,1,1],[5500,3,1]]
+31380	2	31380	300	0	0	0	0	0	0	0	0	[17,19,8]	10			[[5414,3,1],[1158,1,1],[5500,4,1]]
+31380	3	31380	400	0	0	0	0	0	0	0	0	[17,19,8]	10			[[5414,3,1],[1158,1,1],[5500,4,1]]
+31380	4	31380	400	0	0	0	0	0	0	0	0	[17,19,8]	10			[[5414,4,1],[1158,1,1],[5500,5,1]]
+31380	5	31380	500	0	0	0	0	0	0	0	0	[17,19,8]	10			[[5414,4,1],[1158,1,1],[5500,5,1]]
+31380	6	31380	500	0	0	0	0	0	0	0	0	[17,19,8]	10			[[5414,4,1],[1158,1,1],[5500,5,1]]
+31380	7	31380	500	0	0	0	0	0	0	0	0	[17,19,8]	10			[[5414,4,1],[1158,1,1],[5500,5,1]]
+31380	8	31380	500	0	0	0	0	0	0	0	0	[17,19,8]	10			[[5414,4,1],[1158,1,1],[5500,5,1]]
+31380	9	31380	500	0	0	0	0	0	0	0	0	[17,19,8]	10			[[5414,4,1],[1158,1,1],[5500,5,1]]

--
Gitblit v1.8.0