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

chenjiahe

2024-01-08 3bf508c26ca8e8837197e358f5b4802d3ca59844

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

@@ -25,6 +25,8 @@
    String remarks;
    //保留的用户标识
    private String persistUserId;
    //保留的用户名称
    private String persistUserName;
    //合并作废的用户标识
    private String repealUserId;
}