Merge remote-tracking branch 'origin/master'

fuliqi

2024-08-09 b04753affc29f1042d0eb75b0af87824a0f4a8aa

 ycl-server/src/main/java/com/ycl/calculate/FaceDeviceSampleCalculation.java

@@ -66,7 +66,7 @@

            // 处理省厅数据
            if (!CollectionUtils.isEmpty(provinceIds) && provinceIds.contains(monitor.getSerialNumber())) {
                String provinceKey = "Province_" + deptId;
                String provinceKey = ApiConstants.Province + deptId;
                updateAreaStats(areaStatsMap, provinceKey, result);
            }
        }