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

cehua_wcy

2018-11-12 933746e90b949908050968d170c0841600857f24

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