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

cehua-TT

2019-02-21 0a986d7e6e45ade96bf45e6381edbeb96d83b0cb

1
2
3
4
#ÌìÊéÏà¹ØÊýÁ¿ÉÏÏÞµÄÅäÖÃ[¿É¼ûÈÎÎñÊý, Ã¿ÈÕÍê³ÉµÄÈÎÎñÉÏÏÞ, ÐÇÊýÉÏÏÞ, ³­Â¼µãÉÏÏÞ] 
( 
[5,5,12,10000,] 
)