From a96948456e0a21ab33deeb2edfdd7ef343aec5bf Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期六, 25 四月 2026 16:20:34 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/basic/dto/CustomerPrivatePoolDto.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/dto/CustomerPrivatePoolDto.java b/src/main/java/com/ruoyi/basic/dto/CustomerPrivatePoolDto.java
index c06f542..e452a24 100644
--- a/src/main/java/com/ruoyi/basic/dto/CustomerPrivatePoolDto.java
+++ b/src/main/java/com/ruoyi/basic/dto/CustomerPrivatePoolDto.java
@@ -8,7 +8,7 @@
import com.ruoyi.basic.pojo.CustomerFollowUp;
import com.ruoyi.basic.pojo.CustomerPrivatePool;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -25,7 +25,7 @@
private String customerName;
/** 瀹㈡埛鍒嗙被锛氶浂鍞鎴凤紝杩涢攢鍟嗗鎴� */
- @ApiModelProperty(value = "瀹㈡埛瑕乮d")
+ @Schema(description = "瀹㈡埛瑕乮d")
private Long customerId;
/**
@@ -95,26 +95,26 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty(value = "閾惰鍩烘湰鎴�")
+ @Schema(description = "閾惰鍩烘湰鎴�")
@Excel(name = "閾惰鍩烘湰鎴�")
private String basicBankAccount;
- @ApiModelProperty(value = "閾惰璐﹀彿")
+ @Schema(description = "閾惰璐﹀彿")
@Excel(name = "閾惰璐﹀彿")
private String bankAccount;
- @ApiModelProperty(value = "寮�鎴疯鍙�")
+ @Schema(description = "寮�鎴疯鍙�")
@Excel(name = "寮�鎴疯鍙�")
private String bankCode;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "璺熻繘璁板綍")
+ @Schema(description = "璺熻繘璁板綍")
private List<CustomerFollowUpDto> followUpList;
- @ApiModelProperty(value = "缁戝畾浜篿ds")
+ @Schema(description = "缁戝畾浜篿ds")
private List< Long> boundIds;
@Excel(isExport = false)
--
Gitblit v1.9.3