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

935090232@qq.com

2021-10-06 23acc4e7eb8673e918620586b96eae25c3e651b2

 zq-erp/src/main/java/com/matrix/system/hive/pojo/ShoppingCarItemsVo.java

@@ -21,8 +21,16 @@
   private Long beatuyId;
   
   private String beatuyName;
	
	

   private Long vipId;

   public Long getVipId() {
      return vipId;
   }

   public void setVipId(Long vipId) {
      this.vipId = vipId;
   }

   public Long getBeatuyId() {
      return beatuyId;