mozhe
/
demo
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
userName 2024-02-23 14:00:07 +08:00
parent 6e2c7023cb 843959b52b
commit ebadce3ee0
2 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ruoyi-demo/src/main/java/com/ruoyi/mts/domain/bo/MesPlanRecordHistoryBo.java
View File

@ -1,17 +1,9 @@
package com.ruoyi.mts.domain.bo; 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.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
import java.util.Date; 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 * 生产计划明细日期记录历史业务对象 mes_plan_record_history
* *
@ -20,38 +12,37 @@ import com.ruoyi.common.core.domain.BaseEntity;
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) public class MesPlanRecordHistoryBo {
public class MesPlanRecordHistoryBo extends BaseEntity {
/** /**
* 主键 * 主键
*/ */
@NotNull(message = "主键不能为空", groups = { EditGroup.class }) // @NotNull(message = "主键不能为空", groups = {EditGroup.class})
private Long id; private Long id;
/** /**
* 记录id * 记录id
*/ */
@NotNull(message = "记录id不能为空", groups = { AddGroup.class, EditGroup.class }) // @NotNull(message = "记录id不能为空", groups = {AddGroup.class, EditGroup.class})
private Long recordId; private Long recordId;
/** /**
* 记录日期 * 记录日期
*/ */
@NotNull(message = "记录日期不能为空", groups = { AddGroup.class, EditGroup.class }) // @NotNull(message = "记录日期不能为空", groups = {AddGroup.class, EditGroup.class})
private Date recordDate; private Date recordDate;
/** /**
* 备注 * 备注
*/ */
@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) // @NotBlank(message = "备注不能为空", groups = {AddGroup.class, EditGroup.class})
private String remark; private String remark;
/** /**
* oss_id * oss_id
*/ */
@NotNull(message = "oss_id不能为空", groups = { AddGroup.class, EditGroup.class }) // @NotNull(message = "oss_id不能为空", groups = {AddGroup.class, EditGroup.class})
private Long ossId; private Long ossId;
private Date createTime;
} }

8
ruoyi-demo/src/main/java/com/ruoyi/mts/domain/vo/MesPlanRecordHistoryVo.java
View File

@ -1,15 +1,11 @@
package com.ruoyi.mts.domain.vo; 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.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.convert.ExcelDictConvert;
import lombok.Data; import lombok.Data;
import java.util.Date;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
/** /**
* 生产计划明细日期记录历史视图对象 mes_plan_record_history * 生产计划明细日期记录历史视图对象 mes_plan_record_history
@ -53,5 +49,5 @@ public class MesPlanRecordHistoryVo implements Serializable {
@ExcelProperty(value = "oss_id") @ExcelProperty(value = "oss_id")
private Long ossId; private Long ossId;
private Date createTime;
} }