diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BPlanEnterprise.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BPlanEnterprise.java index 1347725..370dbcd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BPlanEnterprise.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BPlanEnterprise.java @@ -43,61 +43,61 @@ public class BPlanEnterprise { @ApiModelProperty(value = "企业id") private String enterpriseId; -// /** -// * 创建者ID -// */ -// @ApiModelProperty(value = "创建者ID") -// private Long createId; -// -// /** -// * 创建者 -// */ -// @ApiModelProperty(value = "创建者") -// private String createBy; -// -// /** -// * 创建时间 -// */ -// @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd ", timezone = "GMT+8") -// @DateTimeFormat(pattern = "yyyy-MM-dd") -// @ApiModelProperty(value = "创建时间") -// private Date createTime; -// -// /** -// * 更新者ID -// */ -// @ApiModelProperty(value = "更新者ID") -// private Long updateId; -// -// /** -// * 更新者 -// */ -// @ApiModelProperty(value = "更新者") -// private String updateBy; -// -// /** -// * 更新时间 -// */ -// @ApiModelProperty(value = "更新时间") -// private Date updateTime; -// -// /** -// * 备注 -// */ -// @ApiModelProperty(value = "备注") -// private String remark; - -// /** -// * 用户权限id -// */ -// @ApiModelProperty(value = "用户权限id") -// private Long userId; -// -// /** -// * 部门权限id -// */ -// @ApiModelProperty(value = "部门权限id") -// private Long deptId; + /** + * 创建者ID + */ + @ApiModelProperty(value = "创建者ID") + private Long createId; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者") + private String createBy; + + /** + * 创建时间 + */ + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd ", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "创建时间") + private Date createTime; + + /** + * 更新者ID + */ + @ApiModelProperty(value = "更新者ID") + private Long updateId; + + /** + * 更新者 + */ + @ApiModelProperty(value = "更新者") + private String updateBy; + + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; + + /** + * 用户权限id + */ + @ApiModelProperty(value = "用户权限id") + private Long userId; + + /** + * 部门权限id + */ + @ApiModelProperty(value = "部门权限id") + private Long deptId; /** * 计划年份 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseResponse.java index 676484a..57bb11b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseResponse.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,7 +18,7 @@ import java.util.Date; */ @Data @ApiModel("计划企业响应类") -public class BPlanEnterpriseResponse { +public class BPlanEnterpriseResponse extends BaseEntity { private static final long serialVersionUID = -98531345456142440L; /** @@ -34,61 +35,61 @@ public class BPlanEnterpriseResponse { @ApiModelProperty(value = "企业id") private String enterpriseId; - /** - * 创建者ID - */ - @ApiModelProperty(value = "创建者ID") - private Long createId; - - /** - * 创建者 - */ - @ApiModelProperty(value = "创建者") - private String createBy; - - /** - * 创建时间 - */ - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd ", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @ApiModelProperty(value = "创建时间") - private Date createTime; - - /** - * 更新者ID - */ - @ApiModelProperty(value = "更新者ID") - private Long updateId; - - /** - * 更新者 - */ - @ApiModelProperty(value = "更新者") - private String updateBy; - - /** - * 更新时间 - */ - @ApiModelProperty(value = "更新时间") - private Date updateTime; - - /** - * 备注 - */ - @ApiModelProperty(value = "备注") - private String remark; - - /** - * 用户权限id - */ - @ApiModelProperty(value = "用户权限id") - private Long userId; - - /** - * 部门权限id - */ - @ApiModelProperty(value = "部门权限id") - private Long deptId; +// /** +// * 创建者ID +// */ +// @ApiModelProperty(value = "创建者ID") +// private Long createId; +// +// /** +// * 创建者 +// */ +// @ApiModelProperty(value = "创建者") +// private String createBy; +// +// /** +// * 创建时间 +// */ +// @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd ", timezone = "GMT+8") +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @ApiModelProperty(value = "创建时间") +// private Date createTime; +// +// /** +// * 更新者ID +// */ +// @ApiModelProperty(value = "更新者ID") +// private Long updateId; +// +// /** +// * 更新者 +// */ +// @ApiModelProperty(value = "更新者") +// private String updateBy; +// +// /** +// * 更新时间 +// */ +// @ApiModelProperty(value = "更新时间") +// private Date updateTime; +// +// /** +// * 备注 +// */ +// @ApiModelProperty(value = "备注") +// private String remark; +// +// /** +// * 用户权限id +// */ +// @ApiModelProperty(value = "用户权限id") +// private Long userId; +// +// /** +// * 部门权限id +// */ +// @ApiModelProperty(value = "部门权限id") +// private Long deptId; /** * 计划年份