From 363208403f2076fef350a7feaf236e6153f982be Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 10 一月 2025 09:19:28 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwStock.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwStock.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwStock.java
index 9e4dcfd..dc2ec33 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwStock.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwStock.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -54,7 +55,7 @@
@ApiModelProperty(value = "浠撳簱缂栫爜(鍏宠仈yw_warehouse)")
@ExcelColumn(name="浠撳簱缂栫爜(鍏宠仈yw_warehouse)")
- private String warehouseId;
+ private Integer warehouseId;
@ApiModelProperty(value = "鐗╄祫缂栫爜锛堝叧鑱攜w_material)", example = "1")
@ExcelColumn(name="鐗╄祫缂栫爜锛堝叧鑱攜w_material)")
@@ -64,4 +65,33 @@
@ExcelColumn(name="鏁伴噺")
private BigDecimal stock;
+
+ @ApiModelProperty(value = "璧勪骇缂栫爜")
+ @TableField(exist = false)
+ private String materialCode;
+
+ @ApiModelProperty(value = "璧勪骇鍚嶇О")
+ @TableField(exist = false)
+ private String materialName;
+
+ @ApiModelProperty(value = "璧勪骇鏉″舰鐮�")
+ @TableField(exist = false)
+ private String materialQrcode;
+
+ @ApiModelProperty(value = "璧勪骇鍝佺墝")
+ @TableField(exist = false)
+ private String materialBrand;
+
+ @ApiModelProperty(value = "璧勪骇鍗曚綅")
+ @TableField(exist = false)
+ private String materialUnitName;
+
+ @ApiModelProperty(value = "璧勪骇瑙勬牸鍨嬪彿")
+ @TableField(exist = false)
+ private String materialAttr;
+
+ @ApiModelProperty(value = "浠撳簱鍚嶇О")
+ @TableField(exist = false)
+ private String warehouseName;
+
}
--
Gitblit v1.9.3