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

fhx

2023-08-29 4829593daa194b175e9e914634d352c7c4f0ffc6

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