Merge remote-tracking branch 'origin/master'

common/src/main/resources/mapper/base/MeetingPerson.xml

@@ -79,7 +79,7 @@ id_,person_id,meetingInfo_id,create_by,create_time,update_by,update_time,del_fla
 		select * from base_meeting_person where del_flag=false and meetingInfo_id=#{0}
 	</select>
 	<select id="findByMeetingIdAndPersonId" resultMap="MeetingPersonMap">
-		select * from base_meeting_person where del_flag=false and meetingInfo_id = #{meetingInfoId} and person_id = #{personId} limit 1
+		select * from base_meeting_person where del_flag=false and meetingInfo_id = #{meetingId} and person_id = #{personId} limit 1
 	</select>
 	<select id="search" parameterType="hashmap" resultMap="MeetingPersonMap">
 		<![CDATA[