Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-07-21 c4f92fc59c25cc7564ff16895ab271c0d04f1e11

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

@@ -548,7 +548,7 @@
   </select>

   <!-- 分页查询 -->
   <select id="selectInPageByQuery" resultMap="ShopOrderMap">
   <select id="selectInPageByQuery" resultMap="ShopOrderComplexMap">
      select
      o.*,
      s.shop_name