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/vo/allocation/AllocationVo.java | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java index 64c73f2..12ae337 100644 --- a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java +++ b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java @@ -136,6 +136,9 @@ @ApiModelProperty(value = "������������") private List<ApproveTableListVo> approveList; + @ApiModelProperty(value = "������������������") + private Integer keyPoint; + @TableField(exist = false) private String time; -- Gitblit v1.8.0