删除了@Column注解

dev-device/device-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/domain/DeviceCheckBillEntity.java

@@ -34,77 +34,76 @@ public class DeviceCheckBillEntity {
      */
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id", columnDefinition = "not null  int(11) 主键id")
     @ApiModelProperty(name = "主键id")
     private Integer id;
     /**
      * 检查组成员1(省A岗)id
      */
-    @Column(name = "userA_id", columnDefinition = "not null  int(11) 检查组成员1(省A岗)id")
+
     @ApiModelProperty(value = "检查组成员1(省A岗)id")
     private Integer userAId;
     /**
      * 检查组成员2(省A岗)id
      */
-    @Column(name = "userB_id", columnDefinition = "not null  int(11) 检查组成员2(省A岗)id")
+
     @ApiModelProperty(value = "检查组成员2(省A岗)id")
     private Integer userBId;
     /**
      * 核查状态(0:决算待审核,1:决算审核失败,2:决算中,3:决算完成)
      */
-    @Column(name = "check_status", columnDefinition = "not null  int(11) 核查状态(0:决算待审核,1:决算审核失败,2:决算中,3:决算完成)")
+
     @ApiModelProperty(value = "核查状态(0:决算待审核,1:决算审核失败,2:决算中,3:决算完成)")
     private Integer checkStatus;
     /**
      * 核查单位主键id(x作为分隔符)，例如1x2,意为单位id为1和2的装备核查
      */
-    @Column(name = "check_detail", columnDefinition = "not null  text 核查单位主键id(x作为分隔符)，例如1x2,意为单位id为1和2的装备核查")
+
     @ApiModelProperty(value = "核查单位主键id(x作为分隔符)，例如1x2,意为单位id为1和2的装备核查")
     private String checkDetail;
     /**
      * 核查标题
      */
-    @Column(name = "check_title", columnDefinition = "not null  varchar(32) 核查标题")
+
     @ApiModelProperty(value = "核查标题")
     private String checkTitle;
     /**
      * 备注
      */
-    @Column(name = "remark", columnDefinition = "not null  varchar(255) 备注")
+
     @ApiModelProperty(value = "备注")
     private String remark;
     /**
      * 创建用户id
      */
     @CreatedBy
-    @Column(name = "create_user_id", columnDefinition = "not null  int(11) 创建用户id")
+
     @ApiModelProperty(value = "创建用户id")
     private Integer createUserId;
     /**
      * 创建时间
      */
     @CreatedDate
-    @Column(name = "create_time", columnDefinition = "not null  datetime 创建时间")
+
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
     /**
      * 更新用户id
      */
     @LastModifiedBy
-    @Column(name = "update_user_id", columnDefinition = "not null  int(11) 更新用户id")
+
     @ApiModelProperty(value = "更新用户id")
     private Integer updateUserId;
     /**
      * 更新时间
      */
     @LastModifiedDate
-    @Column(name = "update_time", columnDefinition = "not null  datetime 更新时间")
+
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
     /**
      * 删除标记(0:未删除，1:已删除)
      */
-    @Column(name = "delete_tag", columnDefinition = "not null  int(11) 删除标记(0:未删除，1:已删除)")
+
     @ApiModelProperty(value = "删除标记(0:未删除，1:已删除)")
     private Integer deleteTag = 0;
 

dev-device/device-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/domain/DeviceCheckDetailEntity.java

@@ -41,125 +41,125 @@ public class DeviceCheckDetailEntity {
      */
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id", columnDefinition = "not null  int(11) 主键id")
+
     @ApiModelProperty(name = "主键id")
     private Integer id;
     /**
      * 核查账单id
      */
-    @Column(name = "final_check_id", columnDefinition = "not null  int(11) 核查账单id")
+
     @ApiModelProperty(value = "核查账单id")
     private Integer finalCheckId;
     /**
      * 检查组成员1(省A岗)id
      */
-    @Column(name = "check_userA_id", columnDefinition = "not null  int(11) 检查组成员1(省A岗)id")
+
     @ApiModelProperty(value = "检查组成员1(省A岗)id")
     private Integer checkUserAId = 0;
     /**
      * 检查组成员2(省A岗)id
      */
-    @Column(name = "check_userB_id", columnDefinition = "not null  int(11) 检查组成员2(省A岗)id")
+
     @ApiModelProperty(value = "检查组成员2(省A岗)id")
     private Integer checkUserBId = 0;
     /**
      * 本级经办人id(A岗)
      */
-    @Column(name = "userA_id", columnDefinition = "not null  int(11) 本级经办人id(A岗)")
+
     @ApiModelProperty(value = "本级经办人id(A岗)")
     private Integer userAId;
     /**
      * 本级审核人id(B岗)
      */
-    @Column(name = "userB_id", columnDefinition = " null  int(11) 本级审核人id(B岗)")
+
     @ApiModelProperty(value = "本级审核人id(B岗)")
     private Integer userBId;
     /**
      * 核查时间
      */
-    @Column(name = "check_time", columnDefinition = " null  date 核查时间")
+
     @ApiModelProperty(value = "核查时间")
     private Date checkTime;
     /**
      * 核查单位
      */
-    @Column(name = "check_unit", columnDefinition = "not null  varchar(32) 核查单位")
+
     @ApiModelProperty(value = "核查单位")
     private String checkUnit;
     /**
      * 应查数量
      */
-    @Column(name = "checking_count", columnDefinition = "not null  int(11) 应查数量")
+
     @ApiModelProperty(value = "应查数量")
     private Integer checkingCount;
     /**
      * 实查数量
      */
-    @Column(name = "checked_count", columnDefinition = "null  int(11) 实查数量")
+
     @ApiModelProperty(value = "实查数量")
     private Integer checkedCount;
     /**
      * 核查结果
      */
-    @Column(name = "check_result", columnDefinition = "null  varchar(32) 核查结果")
+
     @ApiModelProperty(value = "核查结果")
     private String checkResult;
     /**
      * 核查详情(装备主键id+核对结果(0缺失1无误2新增,字符-作为状态分隔符字符,作为分隔符))
      */
-    @Column(name = "check_detail", columnDefinition = "null  text 核查详情")
+
     @ApiModelProperty(value = "核查详情(装备主键id+核对结果(0缺失1无误2新增3不在库9未检查,字符x作为分隔符)),例如1-2,2-2,意为主键id为1的装备缺失,为2的无误,为3的新增")
     private String checkDetail;
     /**
      * 核查状态(0:待核查,1:审核失败,2:核查完成)
      */
-    @Column(name = "check_status", columnDefinition = "not null  int(11) 核查状态(0:待核查,1:审核失败,2:核查完成)")
+
     @ApiModelProperty(value = "核查状态(0:待核查,1:审核失败,2:核查完成)")
     private Integer checkStatus;
     /**
      * 创建用户id
      */
     @CreatedBy
-    @Column(name = "create_user_id", columnDefinition = "not null  int(11) 创建用户id")
+
     @ApiModelProperty(value = "创建用户id")
     private Integer createUserId;
     /**
      * 创建时间
      */
     @CreatedDate
-    @Column(name = "create_time", columnDefinition = "not null  datetime 创建时间")
+
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
     /**
      * 更新用户id
      */
     @LastModifiedBy
-    @Column(name = "update_user_id", columnDefinition = "not null  int(11) 更新用户id")
+
     @ApiModelProperty(value = "更新用户id")
     private Integer updateUserId;
     /**
      * 更新时间
      */
     @LastModifiedDate
-    @Column(name = "update_time", columnDefinition = "not null  datetime 更新时间")
+
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
     /**
      * 删除标记(0:未删除，1:已删除)
      */
-    @Column(name = "delete_tag", columnDefinition = "not null  int(11) 删除标记(0:未删除，1:已删除)")
+
     @ApiModelProperty(value = "删除标记(0:未删除，1:已删除)")
     private Integer deleteTag = 0;
     /**
      * 预留字段1
      */
-    @Column(name = "remark", columnDefinition = "null  varchar(255) 备注")
+
     @ApiModelProperty(value = "备注")
     private String remark;
     /**
      * 预留字段2
      */
-    @Column(name = "var2", columnDefinition = "null  varchar(255) 预留字段2")
+
     @ApiModelProperty(value = "预留字段2")
     private String var2;
     @ApiModelProperty(value = "核查标题")

dev-device/device-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/entity/domain/DeviceCheckStat.java

@@ -72,34 +72,34 @@ public class DeviceCheckStat {
      * 创建用户id
      */
     @CreatedBy
-    @Column(name = "create_user_id", columnDefinition = "not null  int(11) 创建用户id")
+
     @ApiModelProperty(value = "创建用户id")
     private Integer createUserId;
     /**
      * 创建时间
      */
     @CreatedDate
-    @Column(name = "create_time", columnDefinition = "not null  datetime 创建时间")
+
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
     /**
      * 更新用户id
      */
     @LastModifiedBy
-    @Column(name = "update_user_id", columnDefinition = "not null  int(11) 更新用户id")
+
     @ApiModelProperty(value = "更新用户id")
     private Integer updateUserId;
     /**
      * 更新时间
      */
     @LastModifiedDate
-    @Column(name = "update_time", columnDefinition = "not null  datetime 更新时间")
+
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
     /**
      * 删除标记(0:未删除，1:已删除)
      */
-    @Column(name = "delete_tag", columnDefinition = "not null  int(11) 删除标记(0:未删除，1:已删除)")
+
     @ApiModelProperty(value = "删除标记(0:未删除，1:已删除)")
     private Integer deleteTag = 0;
 

dev-device/device-destroy/src/main/java/com/tykj/dev/device/destroy/entity/vo/DeviceDestroyListVo.java

@@ -6,8 +6,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Column;
-
 /**
  * @author zjm
  * @version 1.0.0
@@ -51,7 +49,7 @@ public class DeviceDestroyListVo {
     /**
      * 文号
      */
-    @Column(name = "doc_number",columnDefinition = "null  int(11) COMMENT ' 文号 '")
+
     @ApiModelProperty(value = "文号")
     private Integer docNumber ;
     /**