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

Compare commits

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

No commits in common. "b8c035d155a3ef1dd351f0caad28528d98bc1437" and "5a5236feacd9574f1a7bef7b9039bc8af85e0bbf" have entirely different histories.
b8c035d155 ... 5a5236feac

1 changed files with 0 additions and 4 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,11 +343,7 @@ 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);
} }
} }