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

cehua_wcy

2018-09-10 7c7213758e3924b17f3d0a19254904c915b748e3

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