From a7501803a3ca43310e57a5dd912e5047919c2e43 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Tue, 15 Jul 2025 15:26:55 +0800
Subject: [PATCH] Merge branch 'xin' into pxb

---
 oying-common/src/main/java/com/oying/utils/enums/MerchantRole.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/oying-common/src/main/java/com/oying/utils/enums/MerchantRole.java b/oying-common/src/main/java/com/oying/utils/enums/MerchantRole.java
index 4ca2028..b150542 100644
--- a/oying-common/src/main/java/com/oying/utils/enums/MerchantRole.java
+++ b/oying-common/src/main/java/com/oying/utils/enums/MerchantRole.java
@@ -8,11 +8,12 @@
 public enum MerchantRole {
 
     // 商户角色
-    OWNER("OWNER", 1),
-    ADMIN("ADMIN", 2),
-    FINANCE("FINANCE", 3),
-    OPERATOR("OPERATOR", 4);
+    OWNER("OWNER", 1,"所有者"),
+    ADMIN("ADMIN", 2,"管理员"),
+    FINANCE("FINANCE", 3,"财务"),
+    OPERATOR("OPERATOR", 4,"操作员");
 
     private final String role;
     private final Integer level;
+    private final String desc;
 }

--
Gitblit v1.9.3