Merge branch 'master-test' of http://1.15.4.62/r/~chenjiahe/phis-service-fe...

ANDRU-PC\Andru

2023-10-20 ecbd04254a0f27ef3ba8f2641d97c0d389710fe8

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