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/OaApprovalApplicationAdMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAdvertisementMapper.xml b/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAdMapper.xml
similarity index 94%
rename from ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAdvertisementMapper.xml
rename to ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAdMapper.xml
index eb0ca9f..22e143d 100644
--- a/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAdvertisementMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationAdMapper.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.OaApprovalApplicationAdvertisementMapper">
+<mapper namespace="com.ruoyi.system.mapper.OaApprovalApplicationAdMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.OaApprovalApplicationAdvertisement">
+    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.OaApprovalApplicationAd">
         <id column="id" property="id" />
         <result column="approval_application_id" property="approvalApplicationId" />
         <result column="title" property="title" />

--
Gitblit v1.7.1