Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

cehua_TRX

2018-09-28 25cf879262f09241dcc027a93c107a147d9ddfd0

 db/PyMongoDataServer/PySysDB/tagFreeGoods.txt

@@ -1,4 +1,4 @@
ID   AwardItem   NeedMoney   ReturnTime
1   {"1":[[2,1,1],[954,10,1],[921,1,1]],"2":[[2,1,1],[954,10,1],[921,1,1]],"3":[[2,1,1],[954,10,1],[921,1,1]]}   1000   60
2   {"1":[[2,1,1],[954,10,1],[921,1,1]],"2":[[2,1,1],[954,10,1],[921,1,1]],"3":[[2,1,1],[954,10,1],[921,1,1]]}   2000   120
3   {"1":[[2,1,1],[954,10,1],[921,1,1]],"2":[[2,1,1],[954,10,1],[921,1,1]],"3":[[2,1,1],[954,10,1],[921,1,1]]}   3000   180
ID   AwardItem   NeedMoney   ReturnTime

1   {"1":[[2,1,1],[954,10,1],[921,1,1]],"2":[[2,1,1],[954,10,1],[921,1,1]],"3":[[2,1,1],[954,10,1],[921,1,1]]}   1000   60

2   {"1":[[2,1,1],[954,10,1],[921,1,1]],"2":[[2,1,1],[954,10,1],[921,1,1]],"3":[[2,1,1],[954,10,1],[921,1,1]]}   2000   120

3   {"1":[[2,1,1],[954,10,1],[921,1,1]],"2":[[2,1,1],[954,10,1],[921,1,1]],"3":[[2,1,1],[954,10,1],[921,1,1]]}   3000   180