From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/vo/TaskReportForRepairsVO.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/vo/TaskReportForRepairsVO.java b/src/main/java/org/springblade/modules/task/vo/TaskReportForRepairsVO.java
index 835eb5a..074ff4c 100644
--- a/src/main/java/org/springblade/modules/task/vo/TaskReportForRepairsVO.java
+++ b/src/main/java/org/springblade/modules/task/vo/TaskReportForRepairsVO.java
@@ -17,6 +17,7 @@
package org.springblade.modules.task.vo;
import io.swagger.annotations.ApiModelProperty;
+import liquibase.pro.packaged.S;
import org.springblade.modules.task.entity.TaskRepairAppraiseEntity;
import org.springblade.modules.task.entity.TaskRepairStepEntity;
import org.springblade.modules.task.entity.TaskReportForRepairsEntity;
@@ -42,10 +43,8 @@
*/
private String addressName;
- /**
- * 角色名称
- */
- private String roleName;
+ // 角色类型 wy
+ private String roleType;
@ApiModelProperty("开始时间")
private String startTime;
@@ -58,6 +57,15 @@
*/
private String regionCode;
+ private String streetName;
+
+ private String communityName;
+ // 网格名称
+ private String gridName;
+
+ // 小区名称
+ private String aoiName;
+
/**
* 事件步骤
*/
@@ -67,4 +75,12 @@
@ApiModelProperty("评分")
private List<TaskRepairAppraiseEntity> taskRepairAppraiseList;
+ // 角色名称
+ @ApiModelProperty(value = "角色名称", example = "")
+ private String roleName;
+
+ // 社区编号
+ @ApiModelProperty(value = "社区编号", example = "")
+ private String communityCode;
+
}
--
Gitblit v1.9.3