Merge branch 'pxb' into xin

xin

2025-09-05 6f3c170403f34d452b5dc733043145d8d760fe41

 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());