fix conflect

Helius

2021-11-17 792a502dd95cadccbef8121673e6b5059a2c3550

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


}