Merge branch 'api' into hive2.0

jyy

2021-01-26 5e43281d1d7a103c8f211ae5c86df7c89466e13b

 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;