Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

hch

2018-11-24 16955f74b09ffc80bf7f37488719e34d152bcea5

1
2
3
4
5
6
7
8
#´ò×ø»ñµÃÕæÆø¼°¾­Ñé 
#  rExp :²Î¿¼¾­Ñé 
#[»Ö¸´¼ä¸ô£¬ ÕæÆø»Ö¸´Á¿£¬¾­Ñé»ñµÃÁ¿] 
( 
 
    [6 * 1000, 1, 'rExp*2'] 
 
)