From 23e3602b4f3ebde8665c3ab3a56ef81b8d671e0d Mon Sep 17 00:00:00 2001
From: zepengdev <lzpsmith@outlook.com>
Date: Wed, 17 Sep 2025 19:17:21 +0800
Subject: [PATCH] feat: 增加商品库存设置功能

---
 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