Merge branch 'score_shop' into api_score_meger

jyy

2021-09-03 b687aa0f371e12d4ec1813f18a4f889e8f825f67

 zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopOrderDao.java

@@ -74,5 +74,7 @@

   public int batchUpdateOrderStatus(@Param("list") List<ShopOrder> list);

   public ShopOrder selectShopOrderByOrderNo(@Param("orderNo")String orderNo);


}