Merge branch 'score_shop' into api_score_meger

jyy

2021-08-20 d5d3d4e6397f23782958748f46c389b85eaafe47

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

@@ -366,7 +366,7 @@
      FROM
      shop_invoice i
      LEFT JOIN shop_order o ON i.order_id = o.id
      LEFT JOIN biz_user b on i.user_id = b.open_id
      LEFT JOIN sys_vip_info b on i.user_id = b.id
      <where>
        <include refid="where_sql"></include>
       </where>
@@ -385,7 +385,7 @@
      FROM
      shop_invoice i
      LEFT JOIN shop_order o ON i.order_id = o.id
      LEFT JOIN biz_user b on i.user_id = b.open_id
      LEFT JOIN sys_vip_info b on i.user_id = b.id
      <where>
         <include refid="where_sql"></include>
      </where>
@@ -419,7 +419,7 @@
      FROM
      shop_invoice i
      LEFT JOIN shop_order o ON i.order_id = o.id
      LEFT JOIN biz_user b on i.user_id = b.open_id
      LEFT JOIN sys_vip_info b on i.user_id = b.id
      where  invo_id=#{invoId} 
   </select>