From cbdb9ea8d17e07dda2362d1c61e867afe8395ef2 Mon Sep 17 00:00:00 2001 From: cjl <276999030@qq.com> Date: Fri, 20 Oct 2023 18:17:42 +0800 Subject: [PATCH] Merge branch 'cjl' 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