From 6cde6bc12ebb814de85cd0e389ffc7e3869818fb Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期三, 07 九月 2022 17:44:02 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager
---
src/main/java/com/whyc/pojo/MaterialProductApproving.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/pojo/MaterialProductApproving.java b/src/main/java/com/whyc/pojo/MaterialProductApproving.java
index 4549d55..48a6ebc 100644
--- a/src/main/java/com/whyc/pojo/MaterialProductApproving.java
+++ b/src/main/java/com/whyc/pojo/MaterialProductApproving.java
@@ -18,8 +18,8 @@
private String parentCode;
@ApiModelProperty("瀹氬埗琛ㄥ崟鍙�")
private String customCode;
- @ApiModelProperty("瀛愪欢缂栫爜")
- private String subCode;
+ @ApiModelProperty("瀛愪欢鐗╂枡id")
+ private int subMaterialId;
@ApiModelProperty("瀛愪欢鏁伴噺")
private Integer quantity;
@ApiModelProperty("鍏宠仈绫诲瀷:-1(绉婚櫎),1(鍏宠仈)")
@@ -64,12 +64,12 @@
this.customCode = customCode;
}
- public String getSubCode() {
- return subCode;
+ public int getSubMaterialId() {
+ return subMaterialId;
}
- public void setSubCode(String subCode) {
- this.subCode = subCode;
+ public void setSubMaterialId(int subMaterialId) {
+ this.subMaterialId = subMaterialId;
}
public Integer getMainId() {
--
Gitblit v1.9.1