Merge branch 'score_shop' into ty_fix

Helius

2021-11-02 af7f37cbb7a0694c882bdc91174dca39796ad4ad

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


}