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

hch

2018-10-24 24d548d01b442bb05aadde981d93c28c4ccc9dc5

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