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

cehua_LC

2018-11-15 f56f0be78d6f9ceff512f7274d51e900c64ee25d

1
2
3
4
5
6
7
# ÅÜ»·ÈÎÎñÐǼ¶±ýͼ¸ÅÂÊÅäÖà 
 
( 
 
[(10,1),(20,2),(8154,3),(9288,4),(10000,5)] 
 
)