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

cehua_LC

2018-12-04 4eecb76260e4d3b16351d8691b65dc96bff83c6b

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

 db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt

@@ -17,6 +17,6 @@
4    1500    3    [(4010,8,1),(30,500,1)]    ConsumptionRebate3

4    3000    4    [(4681,1,1),(30,1000,1)]    ConsumptionRebate2

5    100    0    [(912,1,1),(4694,2,1)]    ConsumptionRebate3

5    300    1    [(9131,1,1),(4694,2,1)]    ConsumptionRebate2

5    300    1    [(913,1,1),(4694,2,1)]    ConsumptionRebate2

6    100    0    [(4609,1,1),(2213,10,1)]    ConsumptionRebate3

6    300    1    [(4610,1,1),(2213,20,1)]    ConsumptionRebate2