Merge remote-tracking branch 'origin/master'

src/main/java/org/springblade/sing/point/mapper/CmccPointRecordMapper.xml

@@ -21,13 +21,17 @@
         <result column="point" property="point"/>
         <result column="helpGoodsName" property="helpGoodsName"/>
         <result column="userName" property="userName"/>
+        <result column="activeName" property="activeName"/>
+        <result column="activeProductName" property="activeProductName"/>
     </resultMap>
 
 
     <select id="selectCmccPointRecordPage" resultMap="cmccPointRecordResultMap">
-        select pr.*,hg.name helpGoodsName,u.nick_name userName from sing_cmcc_point_record pr
+        select pr.*,hg.name helpGoodsName,u.nick_name userName,sapr.title activeProductName,sar.title activeName from sing_cmcc_point_record pr
         left join sing_help_goods hg on pr.help_goods_id = hg.id
         left join sing_login_user u on pr.user_id = u.id
+        left join sing_active_record sar on pr.active_id = sar.id
+        left join sing_active_product_record sapr on pr.active_product_id = sapr.id
         where pr.is_deleted = 0
         <if test="cmccPointRecord.helpGoodsName != null">
             and hg.name like concat('%',#{cmccPointRecord.helpGoodsName},'%')