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

yuan

2026-04-24 b4a9e12e00b78e1aef8acda070434de9ffd0d66a

 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")