From abf9f4cd1a58f4feed93a3b19b570d9aa32d7208 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 5 Nov 2025 16:49:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/NuBizNuCustomerServerServiceImpl.java         | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java
index 48ef616..019aed7 100644
--- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java
+++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java
@@ -343,11 +343,8 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl<NuBizNuCustome
             List<NuBizNuCustomerServer> directivesList = new ArrayList<>();
             for(NuBizNuCustomerServer etd : directiveList){
                 if(etd.getPackageId().equals(et.getId())){
-<<<<<<< .mine
                     etd.setNetImmediateFile("https://www.focusnu.com/media/upFiles/"+etd.getImmediateFile());
-=======
                     getNetImages(etd);
->>>>>>> .theirs
                     directivesList.add(etd);
                 }
             }