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

fhx

2024-08-29 67f2d8fb6220ce4a2fe639b2c6176414c3ef8779

 phis-feign/src/main/java/com/hz/his/dto/activity/RepoActivityDto.java

@@ -14,8 +14,13 @@

    /** 复购活动id */
    private String activityId;
    /** 复购活动分组id */
    private String groupId;
    /** 用户id */
    private String userId;
    /** 复购商品skuId */
    private List<String> skuIdList;

    /** 限制用户会员等级(多个逗号分隔，空则不限制) */
    private String limitVipLevel;
    /** 限制门店id */