Merge branch 'master-prod-new' into master-test

Andru

2024-01-12 efe28af6e1689ed5bd7edbd57b02421863fe8793

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

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

    /**门店-三大项目执行数据*/
    @PostMapping("/admin/export/shop/relation/project/list/sale")
    Result relationProjectList(@RequestBody ShopReportDto shopReportDto);

}