Merge branch 'master-prod-new' into master-fwq-phis下载中心

fwq

2023-09-22 6f337fb3e6346e9a0da2f2fb9c22730095a45323

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