Merge branch 'buttonmodify' into feature/订单服务单代码改造

xiaoyong931011

2022-03-25 7f4157d6a4983fa57c212e1286181d0d292c78d3

 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;
    }