Merge branch 'score_shop' into api_score_meger

jyy

2021-08-09 cabd43861c6dddaddb30e1fe4dbcdb072e3fb7b7

 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);


}