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

fwq

2023-06-30 13f8c7c5a4fedf6b7222f6775d414f6e8bf95ebc

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

    /**