From ff0d6cc27326837e5797ece1aa1a2c1bf0a9930f Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 24 十月 2022 13:21:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java b/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
index 4e38b2e..1a383c8 100644
--- a/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
@@ -104,7 +104,7 @@
user.setPhonenumber(config.getPhonenumber());
user.setLoginName(config.getLoginName());
user.setMasterIds(config.getMasterIds());
- user.setRoleIds(2+"");
+ user.setRoleIds("2");
user.setUserType("2");
user.setStatus(config.getStatus());
user.setUpdateTime(LocalDateTime.now());
@@ -222,4 +222,5 @@
public ResultData queryList(@RequestParam(value = "keyWord",required = false) String keyWord){
return ResultData.success(IUserService.queryList(2,keyWord));
}
+
}
--
Gitblit v1.7.1