将原有id改为会议id, 新增situationId 为成员id

jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.jero.meeting.mapper.PayMeetingMapper">
     <resultMap id="PayMeetingResultMap" type="com.jero.meeting.entity.PayMeeting">
         <id column="id" property="id"/>
+        <id column="situationId" property="situationId"/>
         <result column="create_by" property="createBy"/>
         <result column="create_time" property="createTime"/>
         <result column="update_by" property="updateBy"/>
@@ -33,7 +34,7 @@
         <result column="pay_mode" property="payMode"/>
         <result column="meetingStatus" property="meetingStatus"/>
     </resultMap>
-
+    <!--  将原有id改为会议id, 新增situationId 为成员id  -->
     <select id="pageListContract" resultMap="PayMeetingResultMap">
         select distinct meeting_name,
                meeting_type,
@@ -70,7 +71,8 @@
                case_committee_name,
                notice,
                pms.pay_mode,
-               pms.id,
+               pms.id as situationId,
+               pm.id as id
                (case
                        when date_format(start_time, '%Y-%m-%d') > #{now} then 2
                        when date_format(start_time, '%Y-%m-%d') <![CDATA[<=]]> #{now}