From 2740d50b9cab012e3cc5ba26453b7cbf003156be Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Tue, 28 Nov 2023 19:17:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=86=85=E5=A4=96=E9=83=A8=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml
index 492cbda2..5ce6bab1 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml
@@ -10,7 +10,7 @@
         <result column="MEETING_ORGANIZER" property="meetingOrganizer" />
         <result column="MEETING_TIME" property="meetingTime" />
         <result column="MEETING_ADDRESS" property="meetingAddress" />
-        <result column="agendaNameStr" property="agendaNameStr" />
+        <result column="AGENDA_NAME_STR" property="agendaNameStr" />
         <result column="PARTICIPANTS" property="participants" />
         <result column="MEETING_MINUTES" property="meetingMinutes" />
         <result column="MEETING_CONTENT" property="meetingContent" />
@@ -41,7 +41,7 @@
         mt.ID as mtId,mt.MEETING_ID,mt.AGENDA_NAME,mt.AGENDA_MATERIALS,mt.REPORTER,mt.REPORTING_UNIT,
         mt.AGENDA_CONTENT,
         iom.VALID_FLAG,iom.CREATE_TIME,iom.MODIFY_TIME,
-        iom.agendaNameStr
+        iom.AGENDA_NAME_STR
     </sql>
     <sql id="Base_Where_Clause">
         <trim suffixOverrides="," >
@@ -108,7 +108,7 @@
         select <include refid="Base_Column_Join_MeetingTopic_List" />
         from (select <include refid="Base_Column_List" />,(
             select GROUP_CONCAT(AGENDA_NAME SEPARATOR ',') from meeting_topic where inside_outside_meeting.ID = meeting_topic.MEETING_ID
-        ) as agendaNameStr from inside_outside_meeting where VALID_FLAG = 0 <include refid="Base_Where_Clause"/>
+        ) as AGENDA_NAME_STR from inside_outside_meeting where VALID_FLAG = 0 <include refid="Base_Where_Clause"/>
          <if test="sortField != 'AGENDA_NAME'">
              order by ${sortField} ${sortMode}
          </if>