From 76c366f6eb77c7d55f32113c0528f95d21f023bd Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期四, 11 四月 2024 19:20:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

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 837a5dd..549acc7 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
@@ -140,4 +140,10 @@
      */
     @PostMapping(value = "/user/common/approve/create")
     Result commonApproveCreate(@RequestBody MarketingTotalDto marketingTotalDto);
+
+    /**
+     * 鍒拌鏇存柊鐢ㄦ埛淇℃伅
+     */
+    @PostMapping(value = "/user/arrive/edit")
+    Result arriveEdit(@RequestBody com.alibaba.fastjson.JSONObject data);
 }
\ No newline at end of file

--
Gitblit v1.8.0