From d3563f0bdb487124d79cdd20d0f8bfc79db31f24 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 07 Nov 2025 14:18:08 +0800
Subject: [PATCH] Merge branch 'pxb' into xin
---
oying-common/src/main/java/com/oying/utils/enums/MerchantRole.java | 7 +++----
1 files changed, 3 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 b150542..0ab42e6 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,10 +8,9 @@
public enum MerchantRole {
// 商户角色
- OWNER("OWNER", 1,"所有者"),
- ADMIN("ADMIN", 2,"管理员"),
- FINANCE("FINANCE", 3,"财务"),
- OPERATOR("OPERATOR", 4,"操作员");
+ ADMIN("ADMIN", 1,"管理员"),
+ FINANCE("FINANCE", 2,"财务"),
+ OPERATOR("OPERATOR", 3,"操作员");
private final String role;
private final Integer level;
--
Gitblit v1.9.3