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

CeHua_ZWJ

2018-10-23 bcd189af90ffa237d7aaf932793cbc60af92b53c

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