Merge remote-tracking branch 'origin/dev_2.5_scan' into dev_2.5_scan

src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java

@@ -425,10 +425,10 @@ public class UdiRelevanceService extends ServiceImpl<UdiRelevanceDao, UdiRelevan
 
 
     public List<UdiRelevanceResponse> selectGroupByNameCode(String nameCode, Boolean isDisable) {
-        FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
-        filterUdiRelRequest.setNameCode(nameCode);
-        filterUdiRelRequest.setIsDisable(isDisable);
-        return udiRelevanceDao.filterUdiGp(filterUdiRelRequest);
+//        FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
+//        filterUdiRelRequest.setNameCode(nameCode);
+//        filterUdiRelRequest.setIsDisable(isDisable);
+        return udiRelevanceDao.selectGroupByNameCode(nameCode, isDisable);
     }
 
     public UdiRelevanceResponse selectOneUdi(FilterUdiRelRequest filterUdiRelRequest) {

src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java

@@ -126,6 +126,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
         return collectOrderCodeManMapper.selectOne(new LambdaQueryWrapper<IoCollectOrderCodeMan>().eq(IoCollectOrderCodeMan::getOrderIdFk, billNo)
                 .eq(IoCollectOrderCodeMan::getUdiCode, code).last("limit 1"));
     }
+
     @Resource
     SysWorkplacePutRelService workplacePutRelService;
     @Resource