Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

liyong

2026-05-18 79c1c457302663154f23325116614cf33d8f575b

 src/main/java/com/ruoyi/staff/controller/AnalyticsController.java

@@ -6,7 +6,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import jakarta.annotation.Resource;

@RestController
@RequestMapping("/staff/analytics")