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

cehua_hzl

2018-11-21 0a2816dcee918bd7d9201d3a9edfec533c0a053a

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