Merge branch 'rx-初诊卡标签' into master-test

rx

2024-05-09 cf2c63e5b5265f9af872c27dc79382623ab53bad

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