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

cehua_hzl

2018-11-21 0a2816dcee918bd7d9201d3a9edfec533c0a053a

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