Merge branch 'ty_fix' into alpha

Helius

2021-11-08 ad3f115b29e3c33b32bd38855bdc5b9f2de381b1

 zq-erp/src/main/java/com/matrix/system/hive/bean/SysVipLevel.java

@@ -54,7 +54,15 @@

   private Long shopId;

   private Long companyId;

   public Long getCompanyId() {
      return companyId;
   }

   public void setCompanyId(Long companyId) {
      this.companyId = companyId;
   }

   public Long getShopId() {
      return shopId;