Merge branch 'score_shop' into api_score_meger

jyy

2021-04-26 ebbe59b6ee3378fa296441cabe8bb81b2bc200b5

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

@@ -70,9 +70,11 @@

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

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


}