Merge branch 'api' into hive2.0

935090232@qq.com

2021-01-27 6cf48be93aaf03a3fb0e977e0eaa2d84dc9d9128

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

@@ -38,6 +38,16 @@

    private String color;

    private String shopName;

    public String getShopName() {
        return shopName;
    }

    public void setShopName(String shopName) {
        this.shopName = shopName;
    }

    public Long getUserId() {
        return userId;
    }