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

hch

2018-10-22 43b02080ab4a8ab8f8eed5d812fd4c267615b178

1
2
3
4
5
6
7
#Ñ¡ÔñʹÓÃÑéÖ¤µÄÀàÐÍ, Íò·ÖÂÊ,Ä¿Ç°Ö»ÓÐÒ»ÖÖ 
# 0 ÎªÊý×Ö¼ÓÃÜ 
( 
[ 
    [10000, 0], 
] 
)