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

CeHua_ZWJ

2018-11-13 499417dcdd39e4f0a6b1d1ad7f6eca27c085a56f

1
2
3
4
5
6
7
8
9
10
#·ö³ÖÕ˺ųäÖµ±ÈÀý 
( 
[ 
    [500, 3], 
    [1000, 4], 
    [2000, 5], 
    [5000, 6], 
    [1000000, 10], 
] 
)