Merge remote-tracking branch 'origin/master'

nidapeng

2024-03-21 a38a5c7e5427a5999e8fb40ed353c2c3127e2023

 server/admin_timer/src/main/java/com/doumee/task/ScheduleTaskProgressTool.java

@@ -28,7 +28,7 @@
     */
    @Scheduled(fixedDelay=20*1000)
    public void syncEmpowerResultData()  {
        endId = hkSyncEmpowerService.syncEmpowerResultData(endId);
       hkSyncEmpowerService.syncEmpowerResultData(endId);
    }

}