From 3bbfd6d4e0f3407c54fdbbe02b0f5ea298b582da Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期二, 04 七月 2023 10:46:56 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java | 4 +---
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 3 ++-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
index 1164640..bdb7374 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
@@ -48,7 +48,8 @@
/**绗笁鏂硅鍗曠紪鍙�*/
private String otherOrderNo;
-
/**绗笁鏂瑰厬鎹㈢爜*/
private String redemptionCode;
+ /**缁撹处涔嬪悗鏄惁鐩存帴鍒掓墸锛�0鍚�1鏄�*/
+ private Integer directDeduction;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
index e967991..33a1f71 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
@@ -96,9 +96,7 @@
*/
@PostMapping(value = "/user/families/room/info/update")
Result updateUserFamiliesRoomInfo(@RequestBody UserParamDto userParamDto);
-
-
-
+
/**
* 寮�鏀惧钩鍙�-鐢ㄦ埛绛夌骇閲嶆柊璁＄畻
*/
--
Gitblit v1.8.0