From e8200d6698814ecdf28a319804000b999e63d882 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期四, 25 八月 2022 15:57:02 +0800
Subject: [PATCH] 物料-产品审批

---
 src/main/java/com/whyc/pojo/MaterialProductHistory.java |   47 +++++++++++++++++++++++++++++++++++------------
 1 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/whyc/pojo/MaterialProductHistory.java b/src/main/java/com/whyc/pojo/MaterialProductHistory.java
index f9e5a16..72eeccb 100644
--- a/src/main/java/com/whyc/pojo/MaterialProductHistory.java
+++ b/src/main/java/com/whyc/pojo/MaterialProductHistory.java
@@ -11,10 +11,14 @@
 public class MaterialProductHistory {
 
     private Integer id;
-    @ApiModelProperty("鐗╂枡id")
+    @ApiModelProperty("涓存椂鏇夸唬鐗╂枡id")
     private Integer materialId;
-    @ApiModelProperty("浜у搧id")
-    private String productId;
+    //@ApiModelProperty("浜у搧id")
+    //private String productId;
+    @ApiModelProperty("姣嶆枡缂栫爜")
+    private String parentCode;
+    @ApiModelProperty("瀹氬埗琛ㄥ崟鍙�")
+    private String customCode;
     @ApiModelProperty("瀛愪欢缂栫爜")
     private String subCode;
     @ApiModelProperty("瀛愪欢鏁伴噺")
@@ -22,7 +26,10 @@
     private Date createTime;
     @ApiModelProperty("鍏宠仈绫诲瀷:1(鍏宠仈)")
     private Integer linkType;
-    private Integer version;
+    @ApiModelProperty("璧峰鐗堟湰鍙�")
+    private Integer sVersion;
+    @ApiModelProperty("缁堟鐗堟湰鍙�")
+    private Integer eVersion;
 
     public Integer getId() {
         return id;
@@ -40,12 +47,20 @@
         this.materialId = materialId;
     }
 
-    public String getProductId() {
-        return productId;
+    public String getParentCode() {
+        return parentCode;
     }
 
-    public void setProductId(String productId) {
-        this.productId = productId;
+    public void setParentCode(String parentCode) {
+        this.parentCode = parentCode;
+    }
+
+    public String getCustomCode() {
+        return customCode;
+    }
+
+    public void setCustomCode(String customCode) {
+        this.customCode = customCode;
     }
 
     public String getSubCode() {
@@ -56,12 +71,20 @@
         this.subCode = subCode;
     }
 
-    public Integer getVersion() {
-        return version;
+    public Integer getSVersion() {
+        return sVersion;
     }
 
-    public void setVersion(Integer version) {
-        this.version = version;
+    public void setSVersion(Integer sVersion) {
+        this.sVersion = sVersion;
+    }
+
+    public Integer getEVersion() {
+        return eVersion;
+    }
+
+    public void setEVersion(Integer eVersion) {
+        this.eVersion = eVersion;
     }
 
     public Date getCreateTime() {

--
Gitblit v1.9.1