Merge branch 'fhx-prod-复购活动' into master-test

fhx

2024-05-10 18294d7efcb050c2fbdc35451085945dcf0499de

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

@@ -16,7 +16,7 @@
     * 统一申请审核接口
     */
    @PostMapping(value = "/common/apply")
    Result applyOrderDiscount(@RequestBody MarketingTotalDto marketingTotalDto);
    Result commonApply(@RequestBody MarketingTotalDto marketingTotalDto);