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

fwq

2024-05-27 ce8772fe14ad96be26004f7edf51ed2346aeeadc

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

 phis-feign/src/main/java/com/hz/his/dto/report/user/UserDetailSelectDto.java

@@ -1,6 +1,6 @@
package com.hz.his.dto.report.user;

import com.hz.his.dto.report.UserDetailReportDto;
import com.hz.his.dto.PageDto;
import lombok.Data;

import java.util.List;
@@ -10,7 +10,16 @@
 * @author fwq
 * */
@Data
public class UserDetailSelectDto extends UserDetailReportDto {
public class UserDetailSelectDto extends PageDto {
    /**门店标识*/
    private List<String> shopIdList;
    /**门店编号*/
    private List<String> shopNoList;
    /**顾问标识*/
    private List<String> adviserIdList;
    /**顾问编号*/
    private List<String> adviserNoList;

    /**查询活跃老VIP,流失(流失)/活跃(状态)/沉睡(状态)之间是【或】关系0:流失 1:活跃 2:沉睡*/
    private List<Integer> oldVipList;

@@ -47,8 +56,8 @@
    /**D客,0:30天无触达,1:3个月无触达,2:6个月无触达,3:1年无触达*/
    private List<Integer> ddLevelList;

    /**颜值规划(一级，二级，三级的集合),之间【或】的关系,各自也是【且】*/
    private List<UserPlanDetailDto> planList;
    /**颜值规划(一级，二级，三级的用'-'拼接的集合),之间【或】的关系,各自也是【且】*/
    private List<String> planList;


}

 phis-feign/src/main/java/com/hz/his/dto/report/user/UserPlanDetailDto.java

File was deleted