From d8acd9f9cfc75571fefb8240bebca1fe9f5c802b Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期三, 13 三月 2024 10:40:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java | 4 +++- ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckRuleVO.java | 2 ++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java index bd2d147..1ac07e1 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java @@ -42,5 +42,7 @@ @TableField("face_chceckpoint_num") private Integer faceChceckpointNum; - + @ApiModelProperty("杩愮淮绫诲埆") + @TableField("category") + private Integer category; } diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckRuleVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckRuleVO.java index a075183..8c95449 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckRuleVO.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckRuleVO.java @@ -36,6 +36,8 @@ /** 浜鸿劯鍗″彛鐐逛綅鏁� */ private Integer faceChceckpointNum; + private Integer category; + public static CheckRuleVO getVoByEntity(@NonNull CheckRule entity, CheckRuleVO vo) { if(vo == null) { vo = new CheckRuleVO(); -- Gitblit v1.8.0