From 84e740f362d574b942b1c9a274425841c9167de8 Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Wed, 15 Nov 2023 08:27:52 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa --- screen-api/src/main/java/com/moral/api/pojo/ext/allocation/AllocationPageExt.java | 4 ++++ 1 files changed, 4 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 bedf4e4..4be9ac7 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 @@ -29,6 +29,10 @@ @ApiModelProperty(value = "������������") private String stateName; + @ApiModelProperty(value = "pc���������������������") + private String isCode; + + //������������������ private String escalationUnitName; } -- Gitblit v1.8.0