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

cehua_wcy

2018-11-13 d8f0af3993a96745783dde0624211dcc40a057e3

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