From ec87cf1ee2b9382bf9d089711f0ff82ae8e7077c Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Wed, 09 Jun 2021 20:44:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiVipLabelAction.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipLabelAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipLabelAction.java
index 5ba12c4..3399e91 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipLabelAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipLabelAction.java
@@ -42,7 +42,7 @@
sysVipLabel.setUserId(getMe().getSuId());
sysVipLabel.setLabel(labelDto.getLabel());
List<SysVipLabel> userLabel = sysVipLabelDao.selectByModel(sysVipLabel);
- AjaxResult ajaxResult = new AjaxResult();
+ AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("获取成功");
ajaxResult.putInMap("allLabel", zbLabel);
ajaxResult.putInMap("myLabel", userLabel);
return ajaxResult;
@@ -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());
--
Gitblit v1.9.1