Merge branch '1.2' of http://192.168.0.87:10010/r/snxx_server into 1.2

CeHua_ZWJ

2018-11-10 9b6868f9992c779d03f5d714b042bf7ec7bfd660

 db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt

@@ -14,6 +14,7 @@
145   

93   {"1":[[5410,1]],"2":[[5410,1]],"3":[[5410,1]]}

138   {"1":[[8353,2]],"2":[[8353,2]],"3":[[8353,2]]}

149   {"1":[[966,1]],"2":[[966,1]],"3":[[966,1]]}

103   

140   

141