Merge branch '2kga_ev2_jiancetai' of http://tyw-server.synology.me:12345/chenjiale/jiancetai into 2kga_ev2_jiancetai
