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

cehua-TT

2018-11-13 08ae922084291712c0b2d65339a2e498b07f4aad

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