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

fhx

2024-02-06 20825f31aba894bb3d588f0696584c4afe618d28

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