Merge branch 'master-fwq-颜值规划4.0' into master-prod-new

fwq

2024-04-15 7285f70c4804d88c175ace932956eec524e2ceda

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