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

fhx

2023-10-11 e5a706033f87f40cb9da3fcd1f6c43758bb15d51

 phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java

@@ -54,6 +54,8 @@
    private String marketActivityId;
    /** 营销活动关联优惠券id */
    private String activityCouponId;
    /** 营销活动分组id */
    private String groupId;

    /** 平台类型(PlatformConstants) */
    private String platformType;