Merge branch 'fhx-prod-秒杀日历' into master-test

fhx

2024-06-04 ac770cb0b7f69231d723d6fd111697fb6df15452

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