From e70053d772947e6e50cfa42f5a544a009699c4ac Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 04 八月 2021 17:31:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordAddDTO.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordAddDTO.java
index 00c4b46..8b6e5d0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordAddDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordAddDTO.java
@@ -1,6 +1,5 @@
package com.panzhihua.common.model.dtos.community;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
@@ -44,13 +43,13 @@
/**
* 巡查领导
*/
- @ApiModelProperty("巡查领导")
+ @ApiModelProperty("巡查领导id")
private String patrolLeader;
/**
* 巡查人员
*/
- @ApiModelProperty("巡查人员")
+ @ApiModelProperty("巡查人员id")
private String patrolPerson;
/**
@@ -123,7 +122,7 @@
* 隐患名称
*/
@ApiModelProperty("隐患名称")
- private String dagerName;
+ private String dangerName;
/**
* 排查时间
@@ -141,7 +140,7 @@
* 隐患简述
*/
@ApiModelProperty("隐患简述")
- private String dagerDescription;
+ private String dangerDescription;
/**
* 是否立即整改（1是 、0否）
@@ -164,7 +163,7 @@
/**
* 整改人员
*/
- @ApiModelProperty("整改人员")
+ @ApiModelProperty("整改人员id")
private String rectifyPerson;
/**
--
Gitblit v1.7.1