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

fwq

2024-04-02 db33dbd0ff7a4e7bb1bbae7dab3d0c69b9ee8642

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

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

@@ -34,13 +34,19 @@
    Result deductionCpList(@RequestBody ShopReportDto shopReportDto);

    /**
     * 再生部-执行业绩数据
     * 再生部-执行业绩数据 -2.0版本
     */
    @PostMapping("/admin/project/relation/report/department/zs/list/V2")
    Result deductionZsListV2(@RequestBody ShopReportDto shopReportDto);

    /**
     * 再生部-执行业绩数据 - 2.0废弃
     */
    @PostMapping("/admin/project/relation/report/department/zs/list")
    Result deductionZsList(@RequestBody ShopReportDto shopReportDto);

    /**
     * 再生部-渗透业绩数据
     * 再生部-渗透业绩数据 - 2.0废弃
     */
    @PostMapping("/admin/project/relation/report/department/zs/permeate/list")
    Result deductionZsPermeateList(@RequestBody ShopReportDto shopReportDto);