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

Compare commits

base: yangjun:5a5236feacd9574f1a7bef7b9039bc8af85e0bbf
Branches Tags
yangjun:master
...
compare: yangjun:b8c035d155a3ef1dd351f0caad28528d98bc1437
Branches Tags
yangjun:master

2 Commits
5a5236feac ... b8c035d155

Author SHA1 Message Date
yangjun b8c035d155 Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_java 
# Conflicts:
#	nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java
 2025-11-05 16:48:53 +08:00
yangjun a147eeb971 添加返回字段 2025-11-05 16:46:49 +08:00
1 changed files with 4 additions and 0 deletions
Show Stats Expand all files Collapse all files

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

@ -343,7 +343,11 @@ 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());
=======
getNetImages(etd); getNetImages(etd);
>>>>>>> .theirs
directivesList.add(etd); directivesList.add(etd);
} }
} }