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

chenjiahe

2024-07-25 37993b3cf3243e6ffdacab526b04dd2284565a42

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

@@ -56,4 +56,10 @@
    @PostMapping("/admin/user/deduction/report/shop/emp/list")
    Result shopEmpUserList(@RequestBody EmployeeReportDto employeeReportDto);

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

}