Merge branch 'master-stander' of http://1.15.4.62/r/~chenjiahe/crm-platform...

guang

2024-06-14 21cc776dfb780d6e2b0335c1542e6d3e898ce8cb

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