yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改冲突

This commit is contained in:
yangjun 2025-11-05 16:49:23 +08:00
parent b8c035d155
commit abf9f4cd1a
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java
View File

@ -343,11 +343,8 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl<NuBizNuCustome
List<NuBizNuCustomerServer> directivesList = new ArrayList<>(); List<NuBizNuCustomerServer> directivesList = new ArrayList<>();
for(NuBizNuCustomerServer etd : directiveList){ for(NuBizNuCustomerServer etd : directiveList){
if(etd.getPackageId().equals(et.getId())){ if(etd.getPackageId().equals(et.getId())){
<<<<<<< .mine
etd.setNetImmediateFile("https://www.focusnu.com/media/upFiles/"+etd.getImmediateFile()); etd.setNetImmediateFile("https://www.focusnu.com/media/upFiles/"+etd.getImmediateFile());
=======
getNetImages(etd); getNetImages(etd);
>>>>>>> .theirs
directivesList.add(etd); directivesList.add(etd);
} }
} }