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

cehua-TT

2018-08-28 8e1794561db2e7bc6f5661b6ab03fd40e76cf807

 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