Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-04-12 1f27afeb9a001ef9df74011ab4ab2a64a3f2c5db

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

@@ -70,7 +70,7 @@

   public int selectShopOrderTotalByApplyId(@Param("applyId") Long applyId);

   public List<Map<String,Object>>  selectOrderStatusCount(String openId);
   public List<Map<String,Object>>  selectOrderStatusCount(Long userId);

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