From dcd2e9ad65580de56147956e718059f50f1691d2 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期五, 30 一月 2026 08:36:12 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index beb9176..582c7b9 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -15,6 +15,7 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.Objects;
@Data
@TableName("asr_wrk_mast")
@@ -247,14 +248,14 @@
@TableField("appe_time")
private Date appeTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "骞舵澘鍑哄簱锛堢紦瀛樺尯AGV绔欑偣")
@TableField("pause_mk")
private String pauseMk;
- @ApiModelProperty("骞舵澘鍑哄簱锛堢紦瀛樺尯AGV绔欑偣锛�")
- @TableField(exist = false)
- private String avgSta;
+// @ApiModelProperty("骞舵澘鍑哄簱锛堢紦瀛樺尯AGV绔欑偣锛�")
+// @TableField(exist = false)
+// private String avgSta;
@ApiModelProperty(value= "")
@TableField("error_time")
@@ -391,8 +392,8 @@
}
}
-
public String getStaNo$(){
+ if (Objects.isNull(this.staNo) || this.staNo.equals("null")) {return null; }
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
BasDevp basDevp = service.selectById(this.staNo);
if (!Cools.isEmpty(basDevp)){
--
Gitblit v1.9.1