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

chenjiahe

2023-05-06 fcbe29760373012bae67ef8d95b587158df72304

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