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

CeHua_ZWJ

2018-12-04 dbba876a044dca9b3cadf7380d3a61a597f10a5d

1
{0: {0: []}, 1: {0: []}, 2: {0: []}, 3: {0: []}, 4: {0: []}, 5: {0: []}, 6: {0: []}}