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

CeHua_ZWJ

2018-11-13 499417dcdd39e4f0a6b1d1ad7f6eca27c085a56f

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