From 85fc287e68f73a9155b1d53d75f7e9bda3577b5e Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 22 九月 2022 19:15:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java            |   15 ++++++++-------
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java |    2 +-
 2 files changed, 9 insertions(+), 8 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 ce6f995..d52c540 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
@@ -49,14 +49,15 @@
 
     /*****************绫诲瀷淇℃伅 娉細浠ヤ笅甯搁噺浠his鐨刄serMoneyLog甯搁噺涓轰富*******************************/
 
-    /**鎿嶄綔浜虹被鍨�-鐢ㄦ埛*/
-    public static final int OPERATOR_TYPE_USER = 0;
-    /**鎿嶄綔浜虹被鍨�-鍛樺伐*/
-    public static final int OPERATOR_TYPE_EMPLOYEE = 1;
-    /**鎿嶄綔浜虹被鍨�-绠$悊鍛�*/
-    public static final int OPERATOR_TYPE_ADMIN = 2;
     /**鎿嶄綔浜虹被鍨�-绯荤粺*/
-    public static final int OPERATOR_TYPE_SYSTEM = 3;
+    public static final int OPERATOR_TYPE_SYSTEM = 0;
+    /**鎿嶄綔浜虹被鍨�-绠$悊鍛�*/
+    public static final int OPERATOR_TYPE_ADMIN = 1;
+    /**鎿嶄綔浜虹被鍨�-鐢ㄦ埛*/
+    public static final int OPERATOR_TYPE_USER = 2;
+    /**鎿嶄綔浜虹被鍨�-鍛樺伐*/
+    public static final int OPERATOR_TYPE_EMPLOYEE = 3;
+
 
     /**鎿嶄綔绫诲瀷-绯荤粺澶勭悊*/
     public static final int OP_TYPE_SYS = 0;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java
index a2b5414..3b66134 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserMoneyService.java
@@ -22,7 +22,7 @@
     /**
      * 寮�鏀惧钩鍙�-鐢ㄦ埛璧勪骇淇敼
      */
-    @PostMapping(value = "/phip/user/money/unclaimed/add")
+    @PostMapping(value = "/user/money/unclaimed/add")
     Result userMoneyUpdate(@RequestBody UserMoneyUpdateDto userMoneyUpdateDto);
 
 }
\ No newline at end of file

--
Gitblit v1.8.0