Merge remote-tracking branch 'origin/rx-1116-营销生日券' into master-test

rx

2023-11-17 2438c8e6950ba4f1557e4de62ae8191150d9e213

 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;