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

935090232@qq.com

2021-07-15 4ca3ceaa2b0f09f2221ee6714918baf5faee4bad

 zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopShoppingCart.java

@@ -35,7 +35,7 @@
   /**
    * 用户ID
    */
   private String  cartUserId;
   private Long  cartUserId;


   /**
@@ -298,11 +298,11 @@
   }


   public String getCartUserId() {
   public Long getCartUserId() {
      return cartUserId;
   }

   public void setCartUserId(String cartUserId) {
   public void setCartUserId(Long cartUserId) {
      this.cartUserId=cartUserId;
   }