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

fwq

2024-05-13 f52dc5114638600e934cc82fe63c4a25f22594cc

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