2 Commitit c1e9331fe3 ... 192c1fd2e3

Tekijä SHA1 Viesti Päivämäärä
  lin.liu 192c1fd2e3 Merge remote-tracking branch 'remotes/origin/master' into dev 3 viikkoa sitten
  lin.liu bf41f9f2ef mybatis plus,生成po逻辑调整 3 viikkoa sitten

+ 7 - 6
secure-producting-host/src/test/java/com/customs/cq/datacenter/host/GenCodeRun.java

@@ -379,12 +379,13 @@ public class GenCodeRun {
             listColumn.add(SET_PRO_DESC_TPL.replaceAll("\\{\\#\\=desc\\}", desc));
 
             if (Objects.equals(isPK, 1)) {
-                listColumn.add("\t@TableId");
-                if (Objects.equals(isIdentity, 1)) {
-                    listColumn.add("(type = IdType.AUTO)");
-                } else {
-                    listColumn.add("(type = IdType.ASSIGN_ID)");
-                }
+                String idStr = "\t@TableId";
+//                if (Objects.equals(isIdentity, 1)) {
+//                    idStr += "(type = IdType.AUTO)";
+//                } else {
+//                    idStr += "(type = IdType.ASSIGN_ID)";
+//                }
+                listColumn.add(idStr);
             }
             if ("is_delete".equalsIgnoreCase(name)) {
                 String columnAnnotation = "\t@TableLogic";