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

cehua_LC

2018-11-15 f56f0be78d6f9ceff512f7274d51e900c64ee25d

1
2
3
EventID    EventName    ClearType    RepeatTime 
1    ÊÀ½çƵµÀÒ»Ìì¿É·¢ÑÔ´ÎÊý            1    10+lv-81 
2    ¹ú¼ÒƵµÀÒ»Ìì¿É·¢ÑÔ´ÎÊý            1    10+lv-41