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

cehua-TT

2018-11-24 ef457561d3d7ad9f2aa7296e344617796a050a9b

 db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt

@@ -1,7 +1,13 @@
RangListType   Condition   Gift
2   10   {"1":[[181,15],[3,2]],"2":[[181,15],[3,2]],"3":[[181,15],[3,2]]}
1   160   {"1":[[3502,2],[3512,2]],"2":[[3502,2],[3512,2]],"3":[[3502,2],[3512,2]]}
3   8   {"1":[[4151,15],[3,2]],"2":[[4151,15],[3,2]],"3":[[4151,15],[3,2]]}
4   180   {"1":[[106,1],[103,1]],"2":[[106,1],[103,1]],"3":[[106,1],[103,1]]}
5   5   {"1":[[3513,2],[3503,2]],"2":[[3513,2],[3503,2]],"3":[[3513,2],[3503,2]]}
6   1000000   {"1":[[106,1],[103,1]],"2":[[106,1],[103,1]],"3":[[106,1],[103,1]]}
RangListType   Condition   Gift

2   15   {"1":[[181,15],[4303,2]],"2":[[181,15],[4303,2]],"3":[[181,15],[4303,2]]}

2   10   {"1":[[181,10],[4303,1]],"2":[[181,10],[4303,1]],"3":[[181,10],[4303,1]]}

7   40   {"1":[[3502,2],[3512,2]],"2":[[3502,2],[3512,2]],"3":[[3502,2],[3512,2]]}

7   30   {"1":[[3502,1],[3512,1]],"2":[[3502,1],[3512,1]],"3":[[3502,1],[3512,1]]}

3   9   {"1":[[4151,15],[3,2]],"2":[[4151,15],[3,2]],"3":[[4151,15],[3,2]]}

3   6   {"1":[[4151,10],[3,1]],"2":[[4151,10],[3,1]],"3":[[4151,10],[3,1]]}

4   190   {"1":[[106,1],[103,1]],"2":[[106,1],[103,1]],"3":[[106,1],[103,1]]}

4   180   {"1":[[105,3],[102,3]],"2":[[105,3],[102,3]],"3":[[105,3],[102,3]]}

5   6   {"1":[[3512,2],[3502,2]],"2":[[3512,2],[3502,2]],"3":[[3512,2],[3502,2]]}

5   5   {"1":[[3512,1],[3502,1]],"2":[[3512,1],[3502,1]],"3":[[3512,1],[3502,1]]}

6   1000000   {"1":[[106,1],[103,1]],"2":[[106,1],[103,1]],"3":[[106,1],[103,1]]}

6   800000   {"1":[[105,3],[102,3]],"2":[[105,3],[102,3]],"3":[[105,3],[102,3]]}