Merge branch 'developer' into hive2.0

Helius

2022-05-27 4351e71d782741143a98f86f6648acd16689165f

 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>