Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbQuantitySummaryServiceImpl.java

@@ -184,7 +184,7 @@ public class CbQuantitySummaryServiceImpl extends ServiceImpl<CbQuantitySummaryM
                 Date now = new Date();
                 long expireTime = DateUtil.between(now, DateUtil.endOfDay(now), DateUnit.SECOND);
                 RedisUtils.setCacheObject(key, "noticed", Duration.ofSeconds(expireTime));
-                return R.ok("系统检测到您近期未进行物料单位换算，请立即进行换算。", 500);
+                return R.ok("系统检测到您近期未进行物料单位换算，请立即进行换算。", unconvertedList);
             }
 
         }