From f697280f473e9387ee387f25a678f113d734c9fe Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 26 九月 2025 18:31:35 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/TCrmSupplierVO.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TCrmSupplierVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TCrmSupplierVO.java
index ecdbd12..1b41530 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TCrmSupplierVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TCrmSupplierVO.java
@@ -11,7 +11,10 @@
@ApiModel(value = "TCrmSupplierVO对象", description = "crm供应商VO")
public class TCrmSupplierVO extends TCrmSupplier {
- @ApiModelProperty(value = "仓库id集合")
- private List<String> warehouseIds;
+ @ApiModelProperty(value = "仓库id")
+ private String warehouseId;
+
+ @ApiModelProperty(value = "仓库名称")
+ private String warehouseName;
}
--
Gitblit v1.7.1