Merge branch 'score_shop' into api_score_meger

wzy

2021-11-11 3fd5c0a8919c5b31efb61860aeffaf932236e4a3

 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