Merge remote-tracking branch 'origin/master'

mitao

3 天以前 dfe379f10f5d16a3b34b33f260d3a7ca97c7fdc6

 generator/src/test/java/com/xizang/CodeGeneratorTests.java

@@ -25,7 +25,7 @@

    private static final String DRIVER_NAME = "com.mysql.cj.jdbc.Driver";

    private static final String JDBC_URL = "jdbc:mysql://192.168.110.188:3307/shehong_intelligent_platform?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai";
    private static final String JDBC_URL = "jdbc:mysql://192.168.110.188:3307/shehong_intelligent_platform_p2?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai";
    private static final String USER_NAME = "root_remote";
    private static final String PASSWORD = "123456";

@@ -149,7 +149,7 @@
//         strategy.setTablePrefix(pc.getModuleName() + "");
//        strategy.setLikeTable(new LikeTable("room"));
        //strategy.setLikeTable(new LikeTable("member"));
        strategy.setLikeTable(new LikeTable("asset_"));// 生成表名
        strategy.setLikeTable(new LikeTable("year_"));// 生成表名
//        strategy.setLikeTable(new LikeTable("oa_"));// 生成表名
//        strategy.setLikeTable(new LikeTable("t_hotel"));// 生成表名
//        strategy.setLikeTable(new LikeTable("t_scan_message"));// 生成表名