Merge remote-tracking branch 'origin/rx0711-回访优化' into master-test

rx

2024-07-12 dc64ad472cdccec82104025ff7f14d8f38107791

 phis-feign/src/main/java/com/hz/his/dto/user/UserMergeDto.java

@@ -25,4 +25,6 @@
    private String operatorName;
    /**操作时间-yyyy-MM-dd HH:mm:ss*/
    private String opTime;
    /**操作备注*/
    private String opRemarks;
}