conflect fix

Helius

2021-06-11 289b0503bc197d196997142f60b3a8ef8b70f0cc

 zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesGroupJoinDao.xml

@@ -247,7 +247,7 @@
         t3.nick_name headName
      from shop_activities_group_join t1
      inner join shop_activities_group_price t2 on t1.gp_id=t2.id
      inner join biz_user t3 on t1.gj_head_id=t3.open_id
      inner join sys_vip_info t3 on t1.gj_head_id=t3.id
      where t1.act_id  = #{record.actId}
      <if test="pageVo !=null"><!-- 判断pageVo对象是否为空 -->
         <if test="pageVo.sort !=null  and pageVo.order !=null">
@@ -310,7 +310,7 @@
         t3.avatar_url avatarUrl
      from shop_activities_group_join t1
      inner join shop_activities_group_join_user t2 on t1.id=t2.gj_id and t2.is_has_cancel=2 and t2.is_has_pay=1
      left join biz_user t3 on t2.user_id=t3.open_id
      left join sys_vip_info t3 on t2.user_id=t3.id
      where t1.id=#{gjId}
   </select>

@@ -327,7 +327,7 @@
         t3.avatar_url avatarUrl
      from shop_activities_group_join t1
      inner join shop_activities_group_join_user t2 on t1.id=t2.gj_id and t2.is_has_cancel=2
      left join biz_user t3 on t2.user_id=t3.open_id
      left join sys_vip_info t3 on t2.user_id=t3.id
      where t1.id=#{gjId}
   </select>

@@ -350,7 +350,7 @@
         t3.avatar_url
      from shop_activities_group_join t1
      inner join shop_activities_group_price t2 on t1.gp_id=t2.id
      left join biz_user t3 on t1.gj_head_id=t3.open_id
      left join sys_vip_info t3 on t1.gj_head_id=t3.id
      where t1.act_id=#{actId} and t1.gj_status=3
   </select>