合并分支 'revert-69155af9' 到 'master'

src/main/java/com/tykj/workflowcore/model_layer/entity/ColumnInfo.java

@@ -9,7 +9,6 @@ import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
 import javax.persistence.*;
-import java.io.Serializable;
 
 /**
  * @ClassName ColumnInfo
@@ -23,11 +22,7 @@ import java.io.Serializable;
 @Data
 @SQLDelete(sql = "update column_info set deleted = 1 where id = ?")
 @Where(clause = "deleted = 0")
-public class ColumnInfo extends BaseEntity implements Serializable {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Integer id;
+public class ColumnInfo extends BaseEntity {
 
     /**
      * 是否primary key， 0是，1否
@@ -39,7 +34,7 @@ public class ColumnInfo extends BaseEntity implements Serializable {
     private String fieldName;
 
     @ApiModelProperty("修改后的新列名")
-    private String newFieldName;
+    private String NewFieldName;
 
     @ApiModelProperty("列名中文描述")
     private String fieldTitle;

src/main/java/com/tykj/workflowcore/model_layer/entity/TableInfo.java

@@ -27,9 +27,6 @@ import java.io.Serializable;
 @Where(clause = "deleted = 0")
 public class TableInfo extends BaseEntity implements Serializable {
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Integer id;
 
     @ApiModelProperty("表名，不能为空")
     @Column(nullable = false)