Merge branch 'api_score_meger' into alpha

Helius

2022-02-14 c34b0342177c90564ee5c9d3ef25c7442aaf71ba

 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