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

cehua_wcy

2018-11-13 82c42e02c7d09f812c23b9c860a7fd9e3fd03476

1
2
3
4
#¼Ò×åÈÎÎñ½±Àø±¶Âʹ«Ê½ familyLV:¼Ò×åµÈ¼¶ 
( 
    (1+(familyLV - 1)*0.5)*10000 
)