Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

hch

2018-08-28 7e51be41367b2bd4ccbab561e9fb1a86b72bc027

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