From 34c5df174a03341fa469a5196410205cebc26b82 Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Thu, 29 Feb 2024 10:03:34 +0800 Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb --- 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