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

cehua_wcy

2018-11-10 ec8e9d53198d1939777f6fd1745e729907b1dbec

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