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/ShopShoppingCartDao.java

@@ -44,7 +44,7 @@

   public Integer selectUserCartCount(@Param("shopId")Long shopId, @Param("openId")String openId);

   public int updateAllSelected(@Param("openId") String openId,@Param("shopId") Long shopId, @Param("isSelected") Integer isSelected);
   public int updateAllSelected(@Param("openId") String openId, @Param("shopId") Long shopId,  @Param("isSelected") Integer isSelected);

   /**
    * 删除用户选中的购物车明细