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

CeHua_ZWJ

2018-09-13 f656c60800a15e394997a1c94f0a6eeea2bca7e3

1
2
3
4
5
6
Start     End    Percent 
0    1    0 
1    2    2 
2    3    6 
3    4    12 
4    5    20