Merge branch 'master-prod-new-优惠券校验' into master-prod-new

wangrenhuang

2023-05-25 c9f2bdee1f786c4634c6c0328dbca7f2d6e37ad5

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