From d8cf4b3db03a4a4c2d12ef21eaec78cb7d3b10d1 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 20 五月 2026 09:22:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_山西_晋和园_pro

---
 src/main/java/com/ruoyi/basic/service/CustomerFollowUpFileService.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/basic/service/CustomerFollowUpFileService.java b/src/main/java/com/ruoyi/basic/service/CustomerFollowUpFileService.java
index 66e5e2c..60f3572 100644
--- a/src/main/java/com/ruoyi/basic/service/CustomerFollowUpFileService.java
+++ b/src/main/java/com/ruoyi/basic/service/CustomerFollowUpFileService.java
@@ -4,8 +4,9 @@
 import com.ruoyi.basic.pojo.CustomerFollowUpFile;
 import com.ruoyi.common.vo.SimpleFileVo;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Null;
+import jakarta.annotation.Nullable;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Null;
 import java.util.List;
 import java.util.function.BiConsumer;
 import java.util.function.Function;
@@ -29,7 +30,7 @@
      * @param <T>
      */
     <T> void fillAttachment(
-           @Null List<T> list,
+           @Nullable List<T> list,
            @NotNull Function<T, String> getAttachmentIds,
            @NotNull BiConsumer<T, List<SimpleFileVo>> setAttachmentList
     );

--
Gitblit v1.9.3