Merge branch 'master-prod-new' into master-test

fhx

2024-08-29 67f2d8fb6220ce4a2fe639b2c6176414c3ef8779

 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiCxjService.java

@@ -30,7 +30,7 @@
    /**
     * 等待情况
     */
    @PostMapping("/admin/cxj/report/appTimeLineChart/waitSituation")
    @PostMapping("/admin/cxj/report/waitSituation")
    Result waitSituation(@RequestBody CxjReportReqDto cxjReportReqDto);

    /**