zy-asrs.git - Gitblit

自动化立体仓库 - WMS系统

parent: f2d4621f | 补丁 | 提交 | show whitespace

Junjie

3 天以前 a6f1c3e8c1070820d04ea7e15f845da655df3281

2个文件已修改

	src/main/java/com/zy/asrs/entity/WrkMast.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/entity/WrkMastLog.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 src/main/java/com/zy/asrs/entity/WrkMast.java

@@ -446,7 +446,7 @@
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.modiUser);
        if (!Cools.isEmpty(user)){
            return String.valueOf(user.getUsername());
            return String.valueOf(user.getNickname());
        }
        return null;
    }

 src/main/java/com/zy/asrs/entity/WrkMastLog.java

@@ -463,7 +463,7 @@
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.modiUser);
        if (!Cools.isEmpty(user)){
            return String.valueOf(user.getUsername());
            return String.valueOf(user.getNickname());
        }
        return null;
    }

			@@ -446,7 +446,7 @@
			UserService service = SpringUtils.getBean(UserService.class);
			User user = service.selectById(this.modiUser);
			if (!Cools.isEmpty(user)){
			return String.valueOf(user.getUsername());
			return String.valueOf(user.getNickname());
			}
			return null;
			}

			@@ -463,7 +463,7 @@
			UserService service = SpringUtils.getBean(UserService.class);
			User user = service.selectById(this.modiUser);
			if (!Cools.isEmpty(user)){
			return String.valueOf(user.getUsername());
			return String.valueOf(user.getNickname());
			}
			return null;
			}