分支合并冲突解决

chenrui

2025-03-13 f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e

 cnas-manage/src/main/resources/mapper/InternalMeetingMapper.xml

@@ -1,6 +1,6 @@
<?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.yuanchu.mom.mapper.InternalMeetingMapper">
<mapper namespace="com.ruoyi.manage.mapper.InternalMeetingMapper">

    <select id="pageInternalMeeting" resultType="com.ruoyi.manage.dto.InternalMeetingDto">
        select *