diff --git a/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/bo/MesPlanRecordHistoryBo.java b/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/bo/MesPlanRecordHistoryBo.java index c744c51..e8f0553 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/bo/MesPlanRecordHistoryBo.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/bo/MesPlanRecordHistoryBo.java @@ -1,17 +1,9 @@ package com.ruoyi.mts.domain.bo; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; import lombok.Data; -import lombok.EqualsAndHashCode; -import javax.validation.constraints.*; import java.util.Date; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.domain.BaseEntity; - /** * 生产计划明细日期记录历史业务对象 mes_plan_record_history * @@ -20,38 +12,37 @@ import com.ruoyi.common.core.domain.BaseEntity; */ @Data -@EqualsAndHashCode(callSuper = true) -public class MesPlanRecordHistoryBo extends BaseEntity { +public class MesPlanRecordHistoryBo { /** * 主键 */ - @NotNull(message = "主键不能为空", groups = { EditGroup.class }) +// @NotNull(message = "主键不能为空", groups = {EditGroup.class}) private Long id; /** * 记录id */ - @NotNull(message = "记录id不能为空", groups = { AddGroup.class, EditGroup.class }) +// @NotNull(message = "记录id不能为空", groups = {AddGroup.class, EditGroup.class}) private Long recordId; /** * 记录日期 */ - @NotNull(message = "记录日期不能为空", groups = { AddGroup.class, EditGroup.class }) +// @NotNull(message = "记录日期不能为空", groups = {AddGroup.class, EditGroup.class}) private Date recordDate; /** * 备注 */ - @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) +// @NotBlank(message = "备注不能为空", groups = {AddGroup.class, EditGroup.class}) private String remark; /** * oss_id */ - @NotNull(message = "oss_id不能为空", groups = { AddGroup.class, EditGroup.class }) +// @NotNull(message = "oss_id不能为空", groups = {AddGroup.class, EditGroup.class}) private Long ossId; - + private Date createTime; } diff --git a/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/vo/MesPlanRecordHistoryVo.java b/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/vo/MesPlanRecordHistoryVo.java index 53dd6c7..125b210 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/vo/MesPlanRecordHistoryVo.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/vo/MesPlanRecordHistoryVo.java @@ -1,15 +1,11 @@ package com.ruoyi.mts.domain.vo; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import com.ruoyi.common.annotation.ExcelDictFormat; -import com.ruoyi.common.convert.ExcelDictConvert; import lombok.Data; -import java.util.Date; import java.io.Serializable; +import java.util.Date; /** * 生产计划明细日期记录历史视图对象 mes_plan_record_history @@ -53,5 +49,5 @@ public class MesPlanRecordHistoryVo implements Serializable { @ExcelProperty(value = "oss_id") private Long ossId; - + private Date createTime; }