From 7073f3506b7c113e049e7af025933bd0d37204c3 Mon Sep 17 00:00:00 2001 From: rx <auster_i@163.com> Date: 星期二, 03 九月 2024 11:07:20 +0800 Subject: [PATCH] Merge branch 'master-basefun' into cjh-basefun-回访重构 --- phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java index 223d314..4ac4119 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java @@ -54,6 +54,9 @@ /**澶囨敞*/ private String remarks; + /** 鎵i櫎鏂瑰紡(0鎵e噺涓嶈冻鎶ラ敊锛�1鎵e噺涓嶈冻鎵e噺鍓╀綑鐨勶紝2鎵e噺涓嶈冻鎵e噺鍒拌礋鏁�) */ + private Integer deductWay = 0; + /*****************绫诲瀷淇℃伅 娉細浠ヤ笅甯搁噺浠his鐨刄serMoneyLog甯搁噺涓轰富*******************************/ /**鎿嶄綔浜虹被鍨�-绯荤粺*/ @@ -84,6 +87,13 @@ /**璧勯噾绫诲瀷-棰勫畾閲�*/ public static final int FUND_TYPE_DEPOSIT = 3; + /** 鎵i櫎鏂瑰紡 - 鎵e噺涓嶈冻鎶ラ敊 */ + public static final Integer DEDUCTION_WAY_NONE = 0; + /** 鎵i櫎鏂瑰紡 - 鎵e噺涓嶈冻鎵e噺鍓╀綑鐨� */ + public static final Integer DEDUCTION_WAY_RESIDUE = 1; + /** 鎵i櫎鏂瑰紡 - 鎵e噺涓嶈冻鎵e噺鍒拌礋鏁� */ + public static final Integer DEDUCTION_WAY_NEGATIVE = 2; + /**鎿嶄綔鏂瑰紡-绯荤粺鎿嶄綔*/ public static final String OPERATION_REASON_SYS = "systemOperation"; /**鎿嶄綔鏂瑰紡-鍏呭�兼搷浣�*/ -- Gitblit v1.8.0