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

chenjiahe

2023-08-23 72a7f0ff972cb612e5793fc86996c31b70e1a969

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

@@ -99,4 +99,5 @@
    @PostMapping("/admin/export/shop/room/list")
    Result roomList(@RequestBody ShopReportDto shopReportDto);


}