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

chenjiahe

2023-12-26 a369ba556c3502319a94f5d5d4d23ffbdd932e39

 crm-platform-feign/src/main/java/com/hz/crm/dto/UserDto.java

@@ -13,8 +13,20 @@
    private String ciq;
    /**搜索*/
    private String hisId;
    /**商品类型*/
    /**电话号码*/
    private Integer tel;


    /**浏览类型*/
    private Integer type;
    /**浏览记录开始时间*/
    String startTime;
    /**浏览记录结束时间*/
    String endTime;
    String remarks;
    //保留的用户标识
    private String persistUserId;
    //保留的用户名称
    private String persistUserName;
    //合并作废的用户标识
    private String repealUserId;
}