Merge branch 'master-stander' into master-xlk

chenjiahe

2024-08-19 675b860c591ca938e0d2c19a93601ce762d98755

Merge branch 'master-stander' into master-xlk

 phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java

@@ -49,4 +49,6 @@

    /**是否过滤已退款的单 0 否 1 是*/
    private Integer isRefund;
    /** 是否剔除卡包订单 */
    private Integer isNotCardBag;
}

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

New file
@@ -0,0 +1,37 @@
package com.hz.phis.vo.user;

import lombok.Data;

import java.util.ArrayList;
import java.util.List;

/**
 * 会员级别数据vo
 * @USER: fhx
 * @DATE: 2024/6/29
 **/
@Data
public class UserLevelDataVo {

    /** 会员等级对应排序后的名称和id */
    private List<String> nameList;
    private List<String> idList;
    /** VIP标识列表 */
    private List<String> vipIdList;
    /** VIP名称列表 */
    private List<String> vipNameList;
    /** 非VIP标识列表 */
    private List<String> notVipIdList;
    /** 非VIP名称列表 */
    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<>();
        this.notVipNameList = new ArrayList<>();
    }

}