Merge branch 'master-stander' into master-jiayan

fwq

2024-09-30 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061

 phis-feign/src/main/java/com/hz/phis/vo/user/UserLevelDataVo.java

@@ -13,6 +13,9 @@
@Data
public class UserLevelDataVo {

    /** 会员等级对应排序后的名称和id */
    private List<String> nameList;
    private List<String> idList;
    /** VIP标识列表 */
    private List<String> vipIdList;
    /** VIP名称列表 */
@@ -23,6 +26,8 @@
    private List<String> notVipNameList;

    public UserLevelDataVo() {
        this.nameList = new ArrayList<>();
        this.idList = new ArrayList<>();
        this.vipIdList = new ArrayList<>();
        this.vipNameList = new ArrayList<>();
        this.notVipIdList = new ArrayList<>();