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

hch

2018-10-22 43b02080ab4a8ab8f8eed5d812fd4c267615b178

1
2
3
4
#ûÓй¥»÷¼ä¸ôµÄ¼¼ÄÜTYPEID 
( 
[5260,5460,5620,5580,6820,6340,6540,7740,7540,7420,7460] 
)