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

cehua-TT

2018-12-13 a7550b57d6c68c5040e2adad0d57dab943bc64dd

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