From 1792a6f14c2dcb4b5732c4abdd9bc439d074a3ad Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 4 Jul 2019 19:41:27 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=A1=E6=89=B9][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E6=8A=A5=E9=94=99]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/basic/WxBrandController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java index 71b6a295d..72557307a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java @@ -75,7 +75,7 @@ public class WxBrandController extends BaseController { wxMerchant.setBrand(wxBrand.getId()); List merchantList = wxMerchantService.findList(wxMerchant); if(CollectionUtils.isNotEmpty(merchantList)){ - return new ResultData(Result.ERROR, "您有未解绑的商户,请先解绑。"); + return new ResultData(Result.ERROR, "请先删除已绑定该品牌的商户。"); } } wxBrandService.update(wxBrand);