From dca1ee5b00f00dcf8c43776eb60bdd23e5cca056 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 26 三月 2024 15:23:29 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Menu.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Menu.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Menu.java
index 77d6a72..fb1b40d 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Menu.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/entity/Menu.java
@@ -276,7 +276,7 @@
UserService service = SpringUtils.getBean(UserService.class);
User user = service.getById(this.createBy);
if (!Cools.isEmpty(user)){
- return String.valueOf(user.getId());
+ return String.valueOf(user.getNickname());
}
return null;
}
@@ -292,7 +292,7 @@
UserService service = SpringUtils.getBean(UserService.class);
User user = service.getById(this.updateBy);
if (!Cools.isEmpty(user)){
- return String.valueOf(user.getId());
+ return String.valueOf(user.getNickname());
}
return null;
}
--
Gitblit v1.9.1