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

Andru

2023-12-13 fc3a12040d6ec88f99c2a4cbe2afb16215ac5ae4

 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;