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

cehua-TT

2018-12-10 c81f4e81368b3f24440b7f1b30f010ff7630a1f1

1
2
3
4
5
#ÌìÌݾº¼¼³¡ÌôÕ½Àäȴʱ¼ä 
{ 
    "CDTime":   1200000,    #CDʱ¼äÀۼƳ¬¹ýÕâ¸öÖµ ½«ÎÞ·¨¼ÌÐøÌôÕ½ 
    "AddCDPer": 300000,    #ÿ´ÎÌôÕ½Ôö¼ÓµÄCDʱ¼ä 
}