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

@@ -22,4 +22,11 @@
    String startTime;
    /**浏览记录结束时间*/
    String endTime;
    String remarks;
    //保留的用户标识
    private String persistUserId;
    //保留的用户名称
    private String persistUserName;
    //合并作废的用户标识
    private String repealUserId;
}