Merge remote-tracking branch 'origin/dev' into cjl

cjl

2024-08-09 a022ae9804d0c2f402711b6b5202319d853919cf

 screen-job/src/main/java/com/moral/api/service/impl/HistorySecondCruiserServiceImpl.java

@@ -116,7 +116,7 @@
                    secondCruiserSort.setValue(rsAvg);
                    secondCruiserSort.setMac(mac);
                    secondCruiserSort.setOrganizationId(organizationId);
                    secondCruiserSort.setTime(startTime);
                    secondCruiserSort.setTime(endTime);
                    list1.add(secondCruiserSort);
                }
            }