From cc1098fc00a50cb1591d182f04bc37066ff0a9e2 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 05 八月 2021 15:12:39 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksVO.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksVO.java
index 1b938aa..824220c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/visit/EventVisitingTasksVO.java
@@ -48,7 +48,6 @@
@ApiModelProperty(value = "需走访人名字")
private String visiterName;
-
@ExcelProperty(value = "身份证号码",index = 3)
@ApiModelProperty(value = "身份证号码")
@EncryptDecryptField
@@ -104,6 +103,8 @@
@ApiModelProperty(value = "网格员联系方式")
private String gridMenberTele;
+ @ApiModelProperty(value = "所属网格")
+ private String gridName;
@ApiModelProperty(value = "需走访人员性别")
private Integer visiterSex;
@@ -182,8 +183,8 @@
private Boolean urgentDell;
- @ApiModelProperty(value = "是否异常行为")
- private Boolean exception;
+ @ApiModelProperty(value = "是否异常行为(1.是 0.否)")
+ private Integer exception;
@ApiModelProperty(value = "走访内容根据重点人员类型输入项不同，录入全部的表单内容数据")
private String tableContentJson;
--
Gitblit v1.7.1