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

cehua_hzl

2018-09-30 cbb36c37db892ef3069c8d8294f2a750ce813cf9

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