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

cehua_wcy

2018-12-11 0e5fe18b8dc858debedb1775cafcaf4a484e2548

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