From bf1f6714fef31bf1e057e21bd7820a3b81610046 Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期三, 07 十二月 2022 16:18:18 +0800
Subject: [PATCH] Merge branch 'master-zhangxu' into master-test

---
 phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 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;

--
Gitblit v1.8.0