From a5a0a3c29a97c807cda8846994d1d8df6adeb9e5 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Mon, 14 Jul 2025 21:09:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pxb' into xin
---
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