Merge remote-tracking branch 'origin/rx-1023-营销优惠券新版' into master-test

rx

2023-10-24 97d7e38d0d0dc419672f9a6dbb12ac0e7f145553

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