Merge branch 'fhx-prod-兑换优惠券' into master-test

fhx

2023-07-14 81ad1c74ca7ea0c544135cb78d8289e79c61f1fc

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

    /**