From baed9b68c8cb6b693d3c010f039d2c55bf242e0e Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期四, 16 十月 2025 18:09:09 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/resources/mapper/system/AssetAdMapper.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/system/AssetAdvertisementMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AssetAdMapper.xml similarity index 93% rename from ruoyi-system/src/main/resources/mapper/system/AssetAdvertisementMapper.xml rename to ruoyi-system/src/main/resources/mapper/system/AssetAdMapper.xml index 45ef845..83ebde0 100644 --- a/ruoyi-system/src/main/resources/mapper/system/AssetAdvertisementMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/AssetAdMapper.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.ruoyi.system.mapper.AssetAdvertisementMapper"> +<mapper namespace="com.ruoyi.system.mapper.AssetAdMapper"> <!-- 通用查询映射结果 --> - <resultMap id="BaseResultMap" type="com.ruoyi.system.model.AssetAdvertisement"> + <resultMap id="BaseResultMap" type="com.ruoyi.system.model.AssetAd"> <id column="id" property="id" /> <result column="asset_name" property="assetName" /> <result column="asset_code" property="assetCode" /> -- Gitblit v1.7.1