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

CeHua_TRX

2018-12-10 3dc4d5cd4fa649819c59103a0ac8a61bbf35898b

 db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt

@@ -11,3 +11,12 @@
3   150   1   [(983,1,1),(4181,1,1),(4151,15,1),(2211,20,1)]   ConsumptionRebate3

3   300   2   [(982,1,1),(4609,1,1),(4182,1,1),(2211,30,1)]   ConsumptionRebate3

3   1500   3   [(4610,1,1),(4182,1,1),(181,30,1),(4151,30,1)]   ConsumptionRebate2

4   60   0   [(2107,10,1)]   ConsumptionRebate3

4   150   1   [(197,1,1),(1128,1,1)]   ConsumptionRebate3

4   300   2   [(4007,4,1),(2213,10,1)]   ConsumptionRebate3

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   [(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