Merge branch 'master-base' into master-fwq-爆款活动2.0

fwq

2024-07-17 cb7bf61ddec695b25f8fe509815c5e5794180b0f

 phis-feign/src/main/java/com/hz/his/vo/user/card/UserCardVo.java

@@ -23,11 +23,13 @@
    private Integer effectiveStatus;

    /**卡包所属用户-标识*/
    private String userUserId;
    private String userId;
    /**卡包所属用户-名称*/
    private String userName;
    /**卡包所属用户-CIQ*/
    private String userCiq;
    /**卡包所属用户-用户所属门店*/
    private String userShopId;

    /**关联的权益*/
    private List<UserCardEquityVo> userCardEquityVoList;