Merge remote-tracking branch 'origin/hive2.0' into hive2.0

jyy

2021-01-25 4d4805096b898a6e99f31794facb81794bd1fcf7

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

@@ -22,7 +22,15 @@
   
   private String beatuyName;
   
   private Long vipId;
   
   public Long getVipId() {
      return vipId;
   }

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

   public Long getBeatuyId() {
      return beatuyId;