Merge branch 'master-prod-new' into master-fwq抽奖配置

fwq

2023-10-30 ef212c321c6d833d69091e7491521f7d11984bfb

 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;