diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java index 62387c5d..5a8c8d3c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java @@ -20,11 +20,9 @@ public class ErpMaterial extends BaseEntity private static final long serialVersionUID = 1L; /** 主键ID */ - @Excel(name = "主键ID") private Long id; /** 删除标志(0代表存在 2代表删除) */ - @Excel(name = "删除标志", readConverterExp = "0=代表存在,2=代表删除") private String delFlag; /** 料号 */ @@ -35,17 +33,13 @@ public class ErpMaterial extends BaseEntity private String materialName; /** 审核状态 0-待审核 1-审核通过 2-审核拒绝*/ - @Excel(name = "审核状态") private String auditStatus; /** 使用状态 0-否 1-是 2-已作废*/ - @Excel(name = "使用状态") private String useStatus; /** 关联bom */ - @Excel(name = "关联bom") private String bomNo; /** 是否有生产团队 */ - @Excel(name = "是否有生产团队") private String havaProductTem; /**技术团队编号 */ private String productItem; @@ -76,35 +70,27 @@ public class ErpMaterial extends BaseEntity private String warehouseDept; /** 流程实例ID */ - @Excel(name = "流程实例ID") private String instanceId; /** 流程实例类型 */ - @Excel(name = "流程实例类型") private String instanceType; /** 提交流程实例ID */ - @Excel(name = "提交流程实例ID") private String submitInstanceId; /** 作废流程实例ID */ - @Excel(name = "作废流程实例ID") private String cancelInstanceId; /** 恢复流程实例ID */ - @Excel(name = "恢复流程实例ID") private String restoreInstanceId; /** 申请人 */ - @Excel(name = "申请标题") private String applyTitle; /** 申请人 */ - @Excel(name = "申请人") private String applyUser; /** 申请时间 */ - @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd") private Date applyTime; private Long photoAttachId;