From 090f4dac98c412c5734a706b853724e2d2accda4 Mon Sep 17 00:00:00 2001 From: cjl <276999030@qq.com> Date: Wed, 25 Oct 2023 15:17:35 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationPageExt.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationPageExt.java b/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationPageExt.java index 4608560..ec7aec1 100644 --- a/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationPageExt.java +++ b/screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationPageExt.java @@ -21,4 +21,6 @@ private Integer applyState; + + private Integer isApprove; } -- Gitblit v1.8.0