From 02a6c170797c5d2750ed07b21f22396a7683c54e Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 25 Oct 2023 15:00:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/pojo/ext/allocationextension/AllocationExtensionPageExt.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/ext/allocationextension/AllocationExtensionPageExt.java b/screen-api/src/main/java/com/moral/api/pojo/ext/allocationextension/AllocationExtensionPageExt.java
index 0ce0e29..d3c755d 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/ext/allocationextension/AllocationExtensionPageExt.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/ext/allocationextension/AllocationExtensionPageExt.java
@@ -37,4 +37,12 @@
@ApiModelProperty(value = "������������")
private Integer changeDay;
+
+ @ApiModelProperty(value = "������������id")
+ private Integer escalationUnitId;
+
+ @ApiModelProperty(value = "���������")
+ private String escalationName;
+
+ private Integer isApprove;
}
--
Gitblit v1.8.0