From 68e750bf109efb0469704e54e48a29649512358c Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 18 Dec 2023 13:31:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationFindVo.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationFindVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationFindVo.java
index 70fefd6..962c35d 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationFindVo.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationFindVo.java
@@ -38,7 +38,20 @@
@ApiModelProperty(value = "������������id")
private Integer changeType;
+ @ApiModelProperty(value = "������������")
+ private String pollutePosition;
+ @ApiModelProperty(value = "������")
+ private String latitude;
+
+ @ApiModelProperty(value = "������")
+ private String longitude;
+
+ @ApiModelProperty(value = "���������������")
+ private String address;
+
+ @ApiModelProperty(value = "������������")
+ private String name;
@ApiModelProperty(value = "������������")
private Integer changeDay;
@@ -63,6 +76,9 @@
@ApiModelProperty(value = "������������")
private Integer isApprove;
+ @ApiModelProperty(value = "������������")
+ private String stateName;
+
public Integer getResidueDay() {
int day = this.changeDay;
if(AllocationApproveEnum.UNDER_RECTIFICATION.value.equals(state)){
--
Gitblit v1.8.0