From 81ef868059473fbf26fc66acf24645d06b79728d Mon Sep 17 00:00:00 2001 From: cjl <276999030@qq.com> Date: Fri, 20 Oct 2023 15:00:48 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa --- screen-api/src/main/java/com/moral/api/pojo/ext/allocationextension/AllocationExtensionPageExt.java | 2 ++ 1 files changed, 2 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 e28afd4..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 @@ -43,4 +43,6 @@ @ApiModelProperty(value = "���������") private String escalationName; + + private Integer isApprove; } -- Gitblit v1.8.0