From d23274eb4b60a2c5a90fb62654b8d6420f0e073b Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 19 十月 2022 11:18:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/UserController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/UserController.java b/flower_city/src/main/java/com/dg/core/controller/UserController.java
index d83f522..76755b1 100644
--- a/flower_city/src/main/java/com/dg/core/controller/UserController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -243,9 +243,9 @@
@Authorization
public ResultData updateConfig(@RequestBody SysUser config,@CurrentUser SysUser sys)
{
- if(config.getUserId()==null)
+ if(config.getId()==null)
{
- return error("userId不能为空");
+ return error("Id不能为空");
}
if(StringUtils.isEmpty(config.getLoginName()))
--
Gitblit v1.7.1