From 05d9fd6f29e17ba0b118443d62bf873b37ee37e4 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期三, 02 七月 2025 22:11:59 +0800
Subject: [PATCH] 去除登陆页logo,异常口出库代码修改
---
src/main/java/com/zy/asrs/entity/WrkMastLog.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
index 4fe2a57..1bd8fdf 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
@@ -297,7 +297,7 @@
@ApiModelProperty(value= "")
@TableField("Pdc_type")
- private String PdcType;
+ private String pdcType;
@ApiModelProperty(value= "")
@TableField("ctn_no")
@@ -344,6 +344,14 @@
@ApiModelProperty(value= "RGV鐩爣绔�")
@TableField("rgv_dsta_no")
private Integer rgvDstaNo;
+
+ @ApiModelProperty(value= "rgv鍛戒护涓嬪彂鏃堕棿")
+ @TableField("rgv_create_time")
+ private Date rgvCreateTime;
+
+ @ApiModelProperty(value= "rgv浠诲姟瀹屾垚鏃堕棿")
+ @TableField("rgv_finish_time")
+ private Date rgvFinishTime;
/**
* 浼寸敓宸ヤ綔鍙�
@@ -413,6 +421,8 @@
LocMast locMast = service.selectById(this.locNo);
if (!Cools.isEmpty(locMast)){
return String.valueOf(locMast.getLocNo());
+ } else if(!Cools.isEmpty(this.locNo)) {
+ return this.locNo;
}
return null;
}
--
Gitblit v1.9.1