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

hxp

2018-08-13 c6338504cf292767e279f225dc9203f3cdf87ea5

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