Merge branch 'master-fwq积分限购' into master-test

fwq

2023-07-18 627a1768b5953a01ff3df44532e75a0bb758c1dd

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