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

cehua-HWJ35

2019-01-15 fbe51d5b4941b5b8a5c146c97c1f21c5558decbf

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