conflect fix

Helius

2021-06-11 289b0503bc197d196997142f60b3a8ef8b70f0cc

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

@@ -465,7 +465,7 @@
      u.nick_name
      from shop_refund_record r
      left join shop_order o on r.order_id = o.id
      LEFT JOIN biz_user u ON r.user_id = u.open_id
      LEFT JOIN sys_vip_info u ON r.user_id = u.id
      <where>
        <include refid="where_sql"></include>
       </where>
@@ -483,7 +483,7 @@
   select count(*)
      from shop_refund_record r
      left join shop_order o on r.order_id = o.id
      LEFT JOIN biz_user u ON r.user_id = u.open_id
      LEFT JOIN sys_vip_info u ON r.user_id = u.id
      <where>
         <include refid="where_sql"></include>
      </where>
@@ -520,7 +520,7 @@
      u.nick_name
      from shop_refund_record r
      left join shop_order o on r.order_id = o.id
      LEFT JOIN biz_user u ON r.user_id = u.open_id
      LEFT JOIN sys_vip_info u ON r.user_id = u.id
      where  r.id=#{id}
   </select>