Merge branch 'ty_fix' into alpha

Helius

2021-11-08 ad3f115b29e3c33b32bd38855bdc5b9f2de381b1

 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;