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

chenjiahe

2023-12-22 07e2391b5e9b527a8aa63fe5515f0536a41b2c65

 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;
}