|
@@ -379,12 +379,13 @@ public class GenCodeRun {
|
|
listColumn.add(SET_PRO_DESC_TPL.replaceAll("\\{\\#\\=desc\\}", desc));
|
|
listColumn.add(SET_PRO_DESC_TPL.replaceAll("\\{\\#\\=desc\\}", desc));
|
|
|
|
|
|
if (Objects.equals(isPK, 1)) {
|
|
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)) {
|
|
if ("is_delete".equalsIgnoreCase(name)) {
|
|
String columnAnnotation = "\t@TableLogic";
|
|
String columnAnnotation = "\t@TableLogic";
|