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

cehua-TT

2018-09-07 d41d2b6ff432bf615beb2981cf0b09e96c3d31d3

1
2
3
4
#Ö§ÏßÈÎÎñ×·¼Ó´ïÈË£¨È«Éí²¿Î»¶¼×·¼ÓÖÁN¼¶£© ÐèÒª´¥·¢ÈÎÎñµÄ×·¼ÓµÈ¼¶ 
( 
[50,100,150,200] 
)