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

CeHua_ZWJ

2018-11-23 df7b6a8f4f8201fa9900a458c6bb7ab7a09acb83

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