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

cehua_LC

2018-10-08 585415f752b89071ae15ca82d9f5a6ad57e92376

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