Merge remote-tracking branch 'origin/master'

src/main/java/com/lsw/model/work/_MappingKit.java

@@ -20,7 +20,7 @@ public class _MappingKit {
 		arp.addMapping("tb_news", "id", News.class);
 		arp.addMapping("tb_news_column", "id", NewsColumn.class);
 		arp.addMapping("tb_position", "id", Position.class);
-		arp.addMapping("tb_resume", "id", Resume.class);
+//		arp.addMapping("tb_resume", "id", Resume.class);
 		arp.addMapping("tb_token", "id", Token.class);
 		arp.addMapping("tb_user", "id", User.class);
 	}