Merge branch 'master' into master-test

wangrenhuang

2023-10-03 7918b04206c4879f098789c619a4d5637906856d

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

    /**