From c4e8e814d2c9e0d03f6449860b70e58657fd7dc2 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 31 十二月 2024 11:58:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzhneasrs' into tzhneasrs
---
src/main/java/com/zy/system/entity/SaasLog.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/system/entity/SaasLog.java b/src/main/java/com/zy/system/entity/SaasLog.java
index aa44f07..abf52b8 100644
--- a/src/main/java/com/zy/system/entity/SaasLog.java
+++ b/src/main/java/com/zy/system/entity/SaasLog.java
@@ -71,6 +71,12 @@
*/
private String workshop;
+ /**
+ * 鍗曟嵁绫诲瀷
+ */
+ @TableField("doc_type")
+ private Long docType;
+
public SaasLog() {}
public SaasLog(Long id,Integer type,String locNo,String matnr,Date ioTime,Long createBy) {
@@ -99,6 +105,9 @@
}
public String getType$(){
+ if (this.type == null) {
+ return "";
+ }
if (this.type ==0) {
return "鍏ュ簱";
} else if (this.type == 1) {
@@ -112,6 +121,9 @@
}
}
+ public String getDocType$(){
+ return "";
+ }
}
--
Gitblit v1.9.1