From be8a4a6f82bd32dc5a3cf2e038848012f336f644 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 15 Nov 2023 08:20:01 +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/AllocationVo.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java
index ddf8f60..12ae337 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java
@@ -136,9 +136,19 @@
@ApiModelProperty(value = "������������")
private List<ApproveTableListVo> approveList;
+ @ApiModelProperty(value = "������������������")
+ private Integer keyPoint;
+
@TableField(exist = false)
private String time;
+ @TableField(exist = false)
+ private String unitName;
+ @TableField(exist = false)
+ private String escalationUnitName;
+ @TableField(exist = false)
+ private String polluteTypeName;
+
public static AllocationVo convert(AllocationExt allocationExt) {
AllocationVo allocationVo = BeanConverts.convert(allocationExt, AllocationVo.class);
--
Gitblit v1.8.0