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

Andru

2023-11-16 046dc12bf491f186ec96450aa5331c25f6e0fe54

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

@@ -22,10 +22,14 @@
    /**卡包-状态*/
    private Integer effectiveStatus;

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

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