Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

fhx

2023-11-06 dfc2c78531b7ea0e27aff23a0f1d10a6b4bad49d

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

    /**