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

CeHua_TRX

2018-12-14 275c352366407472b4b48c3978fc020dd9316c99

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