Merge branch 'rx-营销活动修改' into master-test

rx

2023-12-13 362db9d40ed24eca267187967824fe8b264ff095

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