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-system/src/main/java/com/oying/modules/system/service/impl/UserMerchantServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/system/service/impl/UserMerchantServiceImpl.java b/oying-system/src/main/java/com/oying/modules/system/service/impl/UserMerchantServiceImpl.java
index 8962e13..ac36637 100644
--- a/oying-system/src/main/java/com/oying/modules/system/service/impl/UserMerchantServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/system/service/impl/UserMerchantServiceImpl.java
@@ -65,7 +65,7 @@
List<Map<String, Object>> list = new ArrayList<>();
for (UserMerchant userMerchant : all) {
Map<String, Object> map = new LinkedHashMap<>();
- map.put("角色类型（OWNER、ADMIN、FINANCE、OPERATOR）", userMerchant.getRoleType());
+ map.put("角色类型", userMerchant.getRoleType());
map.put("权限集（备用）", userMerchant.getPermissions());
map.put("创建者", userMerchant.getCreateBy());
map.put("创建时间", userMerchant.getCreateTime());
--
Gitblit v1.9.3