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

chenjiahe

2024-07-25 37993b3cf3243e6ffdacab526b04dd2284565a42

 phis-feign/src/main/java/com/hz/his/feign/service/phis/SPromotionService.java

@@ -41,4 +41,8 @@
    /**获取促销更新列表*/
    @PostMapping(value = "/promotion/update/list")
    Result getUpdatePromotion(@RequestBody PromotionDto promotionDto);

    /**获取暂停和结束销售的促销*/
    @PostMapping(value = "/promotion/noUp/list")
    Result noUpList(@RequestBody PromotionDto promotionDto);
}