From b922fe4d80f7e278b1ff958c4c95626b27cf8266 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 12 四月 2024 15:42:14 +0800
Subject: [PATCH] Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/zy-asrs into phyzasrs
---
src/main/java/com/zy/asrs/entity/AgvBasDevp.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/AgvBasDevp.java b/src/main/java/com/zy/asrs/entity/AgvBasDevp.java
index f606cd1..0442ee2 100644
--- a/src/main/java/com/zy/asrs/entity/AgvBasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/AgvBasDevp.java
@@ -243,20 +243,6 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
- public String getLocType1$() {
- if (null == this.locType1){ return null; }
- switch (this.locType1){
- case 0:
- return "鏈煡";
- case 1:
- return "浣庡簱浣�";
- case 2:
- return "楂樺簱浣�";
- default:
- return String.valueOf(this.locType1);
- }
- }
-
public String getLocType2$() {
if (null == this.locType2){ return null; }
switch (this.locType2){
@@ -285,6 +271,22 @@
}
}
+ public String getLocType1$() {
+ if (null == this.locType1){ return null; }
+ switch (this.locType1){
+ case 0:
+ return "鏈煡";
+ case 1:
+ return "寰呭寘瑁�";
+ case 2:
+ return "鍘熸潗鏂�";
+ case 3:
+ return "绠卞３";
+ default:
+ return String.valueOf(this.locType1);
+ }
+ }
+
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
--
Gitblit v1.9.1