From 6269dc7a50d5028fa616b339cfe790b6e0d5d16e Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 16 Jul 2025 18:20:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/resources/mapper/pc/category/PlatformCategoryMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/oying-system/src/main/resources/mapper/pc/category/PlatformCategoryMapper.xml b/oying-system/src/main/resources/mapper/pc/category/PlatformCategoryMapper.xml
index 86b2d88..7202dfe 100644
--- a/oying-system/src/main/resources/mapper/pc/category/PlatformCategoryMapper.xml
+++ b/oying-system/src/main/resources/mapper/pc/category/PlatformCategoryMapper.xml
@@ -8,7 +8,7 @@
<result column="level" property="level"/>
<result column="sort_weight" property="sortWeight"/>
<result column="icon_id" property="iconId"/>
- <result column="icon_url" property="iconId"/>
+ <result column="icon_url" property="iconUrl"/>
<result column="status" property="status"/>
<result column="active" property="active"/>
<result column="create_by" property="createBy"/>
@@ -18,7 +18,7 @@
</resultMap>
<sql id="Base_Column_List">
- category_id, parent_id, name, level, sort_weight, icon_id, status, active, create_by, create_time, update_by, update_time
+ category_id, parent_id, name, level, sort_weight, icon_id, icon_url, status, active, create_by, create_time, update_by, update_time
</sql>
<select id="findAll" resultMap="BaseResultMap">
--
Gitblit v1.9.3