From 6712b6d4d3bd39713d387fead75b7d65f8d157c2 Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Wed, 27 Sep 2023 19:02:31 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa --- screen-api/src/main/java/com/moral/api/pojo/ext/allocationextension/AllocationExtensionPageExt.java | 6 ++++++ 1 files changed, 6 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..e28afd4 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,10 @@ @ApiModelProperty(value = "������������") private Integer changeDay; + + @ApiModelProperty(value = "������������id") + private Integer escalationUnitId; + + @ApiModelProperty(value = "���������") + private String escalationName; } -- Gitblit v1.8.0