From 2e1d289a38cf4e0dfe0f1c7301b7a365cda8d395 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 15 Dec 2023 16:33:44 +0800
Subject: [PATCH] chore:测试提交
---
screen-api/src/main/java/com/moral/api/pojo/vo/allocationextension/AllocationExtensionVo.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 49 insertions(+), 5 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/allocationextension/AllocationExtensionVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/allocationextension/AllocationExtensionVo.java
index 81e50d4..c93ad27 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/allocationextension/AllocationExtensionVo.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/allocationextension/AllocationExtensionVo.java
@@ -1,6 +1,8 @@
package com.moral.api.pojo.vo.allocationextension;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.moral.api.pojo.ext.allocationextension.AllocationExtensionExt;
+import com.moral.api.pojo.vo.file.FileVo;
import com.moral.api.utils.BeanConverts;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -10,6 +12,7 @@
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
/**
* <p>
@@ -29,8 +32,50 @@
@ApiModelProperty(value = "������id")
private Integer id;
- @ApiModelProperty(value = "���������id")
- private Integer allocationId;
+ @ApiModelProperty(value = "������������")
+ private String allocationNum;
+
+
+ @ApiModelProperty(value = "������������")
+ @JsonFormat(pattern="yyyy-MM-dd")
+ private Date escalationTime;
+
+
+ @ApiModelProperty(value = "������������")
+ private String pollutePosition;
+
+ @ApiModelProperty(value = "������������id")
+ private Integer unitId;
+
+ @ApiModelProperty(value = "������������id")
+ private Integer polluteType;
+
+ @ApiModelProperty(value = "������������id")
+ private Integer changeType;
+
+ @ApiModelProperty(value = "������������")
+ private Integer changeDay;
+
+ @ApiModelProperty(value = "������������id")
+ private Integer escalationUnitId;
+
+ @ApiModelProperty(value = "���������")
+ private String escalationName;
+
+ @ApiModelProperty(value = "������������id")
+ private Integer investigationType;
+
+ @ApiModelProperty(value = "������������")
+ private String problemDescribe;
+
+
+
+ @ApiModelProperty(value = "������������")
+ private List<FileVo> fileBaseList;
+
+ @ApiModelProperty(value = "������������")
+ private List<FileVo> fileList;
+
@ApiModelProperty(value = "������������")
private Integer extensionNum;
@@ -40,9 +85,6 @@
@ApiModelProperty(value = "������")
private Integer state;
-
- @ApiModelProperty(value = "������������")
- private Integer isDel;
@ApiModelProperty(value = "������������")
private Integer isInvalid;
@@ -57,6 +99,7 @@
private String createName;
@ApiModelProperty(value = "������������")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date createTime;
@ApiModelProperty(value = "���������id")
@@ -66,6 +109,7 @@
private String updateName;
@ApiModelProperty(value = "������������")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date updateTime;
--
Gitblit v1.8.0