From 9ca0dc6e7833715b875cc9b6b91d5c497b2bae8b Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期三, 30 八月 2023 09:05:45 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/hazardInvestigationSystem into zf
---
src/main/java/com/gk/hotwork/Domain/InspectionHiddenDanger.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gk/hotwork/Domain/InspectionHiddenDanger.java b/src/main/java/com/gk/hotwork/Domain/InspectionHiddenDanger.java
index c993701..fb92ece 100644
--- a/src/main/java/com/gk/hotwork/Domain/InspectionHiddenDanger.java
+++ b/src/main/java/com/gk/hotwork/Domain/InspectionHiddenDanger.java
@@ -47,7 +47,7 @@
/** 最后更新人 update_by **/
private String updateBy;
/**
- * 整改状态 0未整改，1已整改
+ * 整改状态 -1未整改，1已整改
*/
private Byte status;
/**
@@ -72,8 +72,11 @@
private String reviewMethod;
@TableField(exist = false)
private String veto;
- //附件
+ //隐患附件
@TableField(exist = false)
private List<AttachmentInfo> attachmentList;
+ //整改附件
+ @TableField(exist = false)
+ private List<AttachmentInfo> rattachmentList;
}
--
Gitblit v1.9.2