From 098b507166a2b23f0256d5c4f097e7f05f11e9be Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 28 七月 2021 09:02:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwPatrolRecordDO.java | 53 +++--------------------------------------------------
1 files changed, 3 insertions(+), 50 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwPatrolRecordDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwPatrolRecordDO.java
index 77ec7b4..ddd074a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwPatrolRecordDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComSwPatrolRecordDO.java
@@ -51,9 +51,9 @@
private String wind;
/**
- * (取字典表国家标准编码)巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)
+ * 巡查类型(1.防火巡查2.防汛巡查3.防疫巡查),多条以逗号隔开
*/
- private Integer patrolType;
+ private String patrolType;
/**
* 巡查领导
@@ -110,45 +110,6 @@
*/
private Integer isHiddenDanger;
- /**
- * 隐患名称
- */
- private String dagerName;
-
- /**
- * 排查时间
- */
- private Date checkTime;
-
- /**
- * 主体部门、单位或个人全称
- */
- private String unitName;
-
- /**
- * 隐患简述
- */
- private String dagerDescription;
-
- /**
- * 是否立即整改（1是 、0否）
- */
- private Integer isRectifyImmediately;
-
- /**
- * 采取措施
- */
- private String takeSteps;
-
- /**
- * 采取措施照片
- */
- private String stepsPhoto;
-
- /**
- * 整改人员
- */
- private String rectifyPerson;
/**
* 创建时间
@@ -164,7 +125,7 @@
/**
* 更新时间
*/
- @TableField(fill = FieldFill.UPDATE)
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateAt;
/**
@@ -192,14 +153,6 @@
", successionPerson=" + successionPerson +
", successionTime=" + successionTime +
", isHiddenDanger=" + isHiddenDanger +
- ", dagerName=" + dagerName +
- ", checkTime=" + checkTime +
- ", unitName=" + unitName +
- ", dagerDescription=" + dagerDescription +
- ", isRectifyImmediately=" + isRectifyImmediately +
- ", takeSteps=" + takeSteps +
- ", stepsPhoto=" + stepsPhoto +
- ", rectifyPerson=" + rectifyPerson +
", createAt=" + createAt +
", createBy=" + createBy +
", updateAt=" + updateAt +
--
Gitblit v1.7.1