From b99a9da5e9d943ea1b6e5578501a11dc19fae553 Mon Sep 17 00:00:00 2001 From: wangrenhuang <wangren_huang@163.com> Date: 星期二, 10 十月 2023 17:32:58 +0800 Subject: [PATCH] Merge branch 'master' into master-test --- phis-feign/src/main/java/com/hz/his/dto/user/money/UserIntegralDto.java | 2 ++ phis-feign/src/main/java/com/hz/his/dto/user/money/UserIncrementDto.java | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserIncrementDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserIncrementDto.java index 5dd73ae..f4f6bd2 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserIncrementDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserIncrementDto.java @@ -27,4 +27,7 @@ private String recordId; /**鎿嶄綔绫诲瀷*/ private Integer opType; + + //鏄惁杩囨护棰嗗缓鏁版嵁 + private Integer isFilterate; } diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserIntegralDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserIntegralDto.java index 04617ed..c2a06e9 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserIntegralDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserIntegralDto.java @@ -27,4 +27,6 @@ private String recordId; /**鎿嶄綔绫诲瀷*/ private Integer opType; + //鏄惁杩囨护棰嗗缓鏁版嵁 + private Integer isFilterate; } -- Gitblit v1.8.0