Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

jyy

2021-04-20 d85af61932a03bd03663daf9da33177af5824a5c

 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