Merge remote-tracking branch 'origin/score_shop' into score_shop

jyy

2021-03-25 5857fd14f4608ace25724ba6386d72d210e20870

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

@@ -78,4 +78,6 @@
   public List<Map<String,Object>>  selectOrderStatusCount(String openId);

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


}