From e4db9c4fc4e40d7b41ee0014aaa9feb8ba9e9bf0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 02 三月 2021 17:02:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/zy/asrs/entity/WrkDetl.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 9c917aa..bf0d348 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -140,6 +140,13 @@
@TableField("appe_time")
private Date appeTime;
+ /**
+ * 鐗╂枡鐘舵�� (1鑹搧锛�2涓嶈壇鍝�)
+ */
+ @ApiModelProperty(value= "鐗╂枡鐘舵��")
+ @TableField("mat_status")
+ private String matStatus;
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
--
Gitblit v1.9.1