Merge branch 'master' into master-test

wangrenhuang

2023-10-23 85d1dc328bd46089b63b57bd356908cbba26e29c

 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;