Merge branch 'fhx-prod-秒杀日历' into master-test

fhx

2024-05-31 4014253e14504a35b1c496bf3506c9bc23f640b5

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