Merge branch 'developer'

935090232@qq.com

2022-02-22 bbe0a2fd03063316e50cf141986bda984599bbda

 zq-erp/src/main/java/com/matrix/system/app/action/ApiVipLabelAction.java

@@ -53,6 +53,7 @@
    @PostMapping(value = "/addLabel")
    public AjaxResult addLabel(@RequestBody LabelDto labelDto) {
        SysVipLabel sysVipLabel = new SysVipLabel();
        sysVipLabel.setCreateBy(getMe().getSuName());
        sysVipLabel.setLabel(labelDto.getLabel());
        sysVipLabel.setColor(labelDto.getColor());
        sysVipLabel.setShopId(getMe().getShopId());