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

xiaoyong931011

2021-03-25 b02836d6cdcc2092eb6a864f52c90379e4d171b9

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

@@ -36,7 +36,7 @@
   
   public ShopShoppingCart  selectById(Integer cartId);

   public List<ShopShoppingCart> selectByCartUserId(@Param("shopId")Long shopId, @Param("cartUserId") String cartUserId,@Param("cartType") Integer cartType);
   public List<ShopShoppingCart> selectByCartUserId(@Param("shopId")Long shopId, @Param("cartUserId") String cartUserId);
   
   public ShopShoppingCart  selectForUpdate(Integer cartId);