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

fwq

2023-07-12 d07e5cacbf0f3c1e1b5b42e115e1de574de55aea

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