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

cehua_wcy

2018-10-12 d9bcbc6e39573930755d9119aab0961e3b8f8e81

 db/PyMongoDataServer/PySysDB/tagFreeGoods.txt

New file
@@ -0,0 +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