diff --git a/renren-admin/src/main/java/io/renren/modules/demandComment/dto/TDemandCommentDTO.java b/renren-admin/src/main/java/io/renren/modules/demandComment/dto/TDemandCommentDTO.java index 1adf54c2..203b1081 100644 --- a/renren-admin/src/main/java/io/renren/modules/demandComment/dto/TDemandCommentDTO.java +++ b/renren-admin/src/main/java/io/renren/modules/demandComment/dto/TDemandCommentDTO.java @@ -1,5 +1,6 @@ package io.renren.modules.demandComment.dto; +import io.renren.common.dto.AuditingBaseDTO; import io.renren.modules.demanData.dto.TDemandDataDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -16,7 +17,7 @@ import java.util.Date; */ @Data @ApiModel(value = "需求评论") -public class TDemandCommentDTO implements Serializable { +public class TDemandCommentDTO extends AuditingBaseDTO implements Serializable { private static final long serialVersionUID = 1L; private Long id; @@ -42,6 +43,8 @@ public class TDemandCommentDTO implements Serializable { private String note4; @ApiModelProperty(value = "备用字段") private String note5; + @ApiModelProperty(value = "删除标志:0:正常;1:已删除;2:待审核;3:审核中;9其他") + private Integer delFlag; @ApiModelProperty(value = "评论所属需求主题") private TDemandDataDTO demandDataDTO; diff --git a/renren-admin/src/main/java/io/renren/modules/demandComment/entity/TDemandCommentEntity.java b/renren-admin/src/main/java/io/renren/modules/demandComment/entity/TDemandCommentEntity.java index d7296d4a..062244dd 100644 --- a/renren-admin/src/main/java/io/renren/modules/demandComment/entity/TDemandCommentEntity.java +++ b/renren-admin/src/main/java/io/renren/modules/demandComment/entity/TDemandCommentEntity.java @@ -1,10 +1,9 @@ package io.renren.modules.demandComment.entity; +import com.baomidou.mybatisplus.annotation.TableName; +import io.renren.common.entity.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import com.baomidou.mybatisplus.annotation.*; -import java.util.Date; -import io.renren.common.entity.BaseEntity; /** * 需求评论 @@ -13,45 +12,50 @@ import io.renren.common.entity.BaseEntity; * @since 1.0 2022-04-26 */ @Data -@EqualsAndHashCode(callSuper=false) +@EqualsAndHashCode(callSuper = false) @TableName("t_demand_comment") public class TDemandCommentEntity extends BaseEntity { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - /** - * 评论人部门名称 - */ - private String createDeptName; - /** - * 评论人姓名 - */ - private String name; - /** - * 评论内容 - */ - private String comment; - /** - * 评论主题id - */ - private Long targetId; - /** - * 备用字段 - */ - private String note1; - /** - * 备用字段 - */ - private String note2; - /** - * 备用字段 - */ - private String note3; - /** - * 备用字段 - */ - private String note4; - /** - * 备用字段 - */ - private String note5; + /** + * 评论人部门名称 + */ + private String createDeptName; + /** + * 评论人姓名 + */ + private String name; + /** + * 评论内容 + */ + private String comment; + /** + * 评论主题id + */ + private Long targetId; + /** + * 备用字段 + */ + private String note1; + /** + * 备用字段 + */ + private String note2; + /** + * 备用字段 + */ + private String note3; + /** + * 备用字段 + */ + private String note4; + /** + * 备用字段 + */ + private String note5; + + /** + * 删除标志:0:正常;1:已删除;2:待审核;3:审核中;9其他 + */ + private Integer delFlag; } \ No newline at end of file diff --git a/renren-admin/src/main/resources/application-dev.yml b/renren-admin/src/main/resources/application-dev.yml index bf7332ea..d073d14c 100644 --- a/renren-admin/src/main/resources/application-dev.yml +++ b/renren-admin/src/main/resources/application-dev.yml @@ -51,7 +51,11 @@ spring: wall: config: multi-statement-allow: true - + flyway: + enabled: true + validate-on-migrate: false + # + out-of-order: true #上传的静态资源配置 resource: root_url: 15.2.21.238 diff --git a/renren-admin/src/main/resources/application.yml b/renren-admin/src/main/resources/application.yml index d7b7112e..3393c487 100644 --- a/renren-admin/src/main/resources/application.yml +++ b/renren-admin/src/main/resources/application.yml @@ -61,6 +61,7 @@ spring: locations: filesystem:config/db baseline-on-migrate: true baseline-version: 0 + validate-on-migrate: true fdfs: