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

Helius

2021-01-25 0eb83b49a381c31a51b8c8cec9e4d9d88fd5d16f

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

@@ -24,11 +24,6 @@
    private Long id;

    /**
     * 会员ID
     */
    private Long vipId;

    /**
     * 标签内容
     */
    private String label;
@@ -105,14 +100,6 @@

    public void setId(Long id) {
        this.id = id;
    }

    public Long getVipId() {
        return vipId;
    }

    public void setVipId(Long vipId) {
        this.vipId = vipId;
    }

    public String getLabel() {