Merge branch 'api' of https://gitee.com/jyyforjava/zq-erp into api

Helius

2021-01-16 8e71e461fc119c7863e155e08f803087f1e2a808

 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;