Merge remote-tracking branch 'origin/master-test' into master-test

fhx

2024-06-06 81cf1e143db817a3ac7b9eb1f3042b766db1b14f

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