Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

fhx

2023-12-18 e192c9e13596244cbd4e7912331c19bcc92f2e6c

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