Merge branch 'master-prod-new' into master-fwq-颜值规划4.0

fwq

2024-03-19 eba7eefe07b5b5e2ae09b4b5a48fc0e4462d40d1

 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);