From ba55df302b6cf0218219ced833f22386397d8fa7 Mon Sep 17 00:00:00 2001
From: cehua_ZWJ <123456>
Date: 星期一, 28 一月 2019 16:09:05 +0800
Subject: [PATCH] Merge branch '1.5.100' of http://192.168.0.87:10010/r/snxx_server into 1.5.100
---
db/PyMongoDataServer/PySysDB/tagFBLine.txt | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index eb6ecfc..bd717c7 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]]
@@ -66,9 +67,9 @@
60010 0 60010 105 500 0 0 0 0 0 0 0 [83,13] [3,360,30,10] [[[(30601001,8)],[(30601002,12)],[(30603001,1)]], [101,102,103,104,105]] {1:[[1131,1,1]],2:[[1131,2,1]],3:[[1131,3,1]],4:[[1131,4,1]],5:[[1131,5,1]]}
60010 1 60010 165 500 0 0 0 0 0 0 0 [208,24] [3,360,30,10] [[[(30601003,8)],[(30601004,10)],[(30601005,2)],[(30603002,1)]], [106,107,108,109,110]] {1:[[1132,1,1]],2:[[1132,2,1]],3:[[1132,3,1]],4:[[1132,4,1]],5:[[1132,5,2]]}
60010 2 60010 200 500 0 0 0 0 255 0 0 [317,21] [3,360,30,10] [[[(30601006,8)],[(30601007,12)],[(30601008,2)],[(30603003,1)]], [111,112,113,114,115]] {1:[[1133,1,1]],2:[[1133,2,1]],3:[[1133,3,1]],4:[[1133,4,1]],5:[[1133,5,2]]}
-31160 0 31160 110 230 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1200 [311601,311603] {1:[[101,2]], 2:[[101,2]],3 :[[101,2]], 4:[[101,4]], 5:[[101,4]], 6:[[101,6]]}
-31160 1 31160 231 300 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1200 [311604,311605] {1:[[101,2]], 2:[[101,2]],3 :[[101,2]], 4:[[101,4]], 5:[[101,4]], 6:[[101,6]]}
-31160 2 31160 301 500 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1200 [311606,311607] {1:[[101,2]], 2:[[101,2]],3 :[[101,2]], 4:[[101,4]], 5:[[101,4]], 6:[[101,6]]}
+31160 0 31160 110 230 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1200 [311601,311603] {1:[], 2:[],3 :[[4151,5]], 4:[[4151,5]], 5:[[4151,5]], 6:[[4151,10]]}
+31160 1 31160 231 300 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1200 [311604,311605] {1:[], 2:[],3 :[[4151,5]], 4:[[4151,5]], 5:[[4151,5]], 6:[[4151,10]]}
+31160 2 31160 301 500 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1200 [311606,311607] {1:[], 2:[],3 :[[4151,5]], 4:[[4151,5]], 5:[[4151,5]], 6:[[4151,10]]}
31250 0 31250 0 0 0 0 0 0 0 0 0 [30,18] [0,300,10] [312501,312502,312503] [0,4235]
52010 0 52020 20 0 0 0 0 0 0 0 0 [17,19,8] 10 [520101,520102,520103,520104]
52010 1 52020 40 0 0 0 0 0 0 0 0 [17,19,8] 10 [520105,520106,520107,520108]
@@ -94,3 +95,20 @@
31110 0 31110 80 500 0 0 0 0 0 0 0 [19,13,3] [3, 180, 10, [210, 180, 150, 120], [51,13]] 101
31110 1 31110 80 500 0 0 0 0 0 0 0 [59,13,3] [3, 180, 10, [360, 245, 185, 125], [51,13]] 102
31210 0 31210 0 500 0 0 0 0 0 0 0 [12,6,3] [10, 3600, 60, [1800, 900, 600, 300]] [101,30903001]
+31340 0 31340 300 0 0 0 0 0 0 0 0 [23,29,3] [1800,10,33409003,24,102,5000,{33409001:6,33409002:2},33403001,40,101,1000,10000] [[33402001,33402001,33402001,33402001,33402001,33402001,33402001,33402001],[33402002,33402002,33402002,33402002,33402002,33402002,33402002,33402002,33403002],[33402003,33402003,33402003,33402003,33402003,33402003,33402003,33402003],[33402004,33402004,33402004,33402004,33402004,33402004,33402004,33402004,33403004],[33402005,33402005,33402005,33402005,33402005,33402005,33402005,33402005],[33402006,33402006,33402006,33402006,33402006,33402006,33402006,33402006,33403006]]
+32010 0 32010 150 0 0 0 0 0 0 0 0 [26,6] [180,3,10]
+32010 1 32011 150 0 0 0 0 0 0 0 0 [26,6] [180,3,10]
+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]]
+31380 1 31380 300 0 0 0 0 0 0 0 0 [17,19,8] 10 [[5414,2,1],[1158,1,1]]
+31380 2 31380 300 0 0 0 0 0 0 0 0 [17,19,8] 10 [[5414,3,1],[1158,1,1]]
+31380 3 31380 400 0 0 0 0 0 0 0 0 [17,19,8] 10 [[5414,3,1],[1158,1,1]]
+31380 4 31380 400 0 0 0 0 0 0 0 0 [17,19,8] 10 [[5414,4,1],[1158,1,1]]
+31380 5 31380 500 0 0 0 0 0 0 0 0 [17,19,8] 10 [[5414,4,1],[1158,1,1]]
+31380 6 31380 500 0 0 0 0 0 0 0 0 [17,19,8] 10 [[5414,4,1],[1158,1,1]]
+31380 7 31380 500 0 0 0 0 0 0 0 0 [17,19,8] 10 [[5414,4,1],[1158,1,1]]
+31380 8 31380 500 0 0 0 0 0 0 0 0 [17,19,8] 10 [[5414,4,1],[1158,1,1]]
+31380 9 31380 500 0 0 0 0 0 0 0 0 [17,19,8] 10 [[5414,4,1],[1158,1,1]]
--
Gitblit v1.8.0