From 76293d27f60ca77343e77d35bfbfae97cdc6035f Mon Sep 17 00:00:00 2001 From: lihang <lihang@vci-tech.com> Date: 星期三, 24 五月 2023 18:34:37 +0800 Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs --- Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodeSrchCondConfigVO.java | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodeSrchCondConfigVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodeSrchCondConfigVO.java index a80d45b..6002bef 100644 --- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodeSrchCondConfigVO.java +++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodeSrchCondConfigVO.java @@ -1,6 +1,7 @@ package com.vci.ubcs.code.vo; import com.baomidou.mybatisplus.annotation.TableName; +import com.vci.ubcs.code.entity.CodeSrchCondConfig; import com.vci.ubcs.code.vo.pagemodel.BaseModelVO; import com.vci.ubcs.starter.revision.model.BaseModel; import io.swagger.annotations.ApiModel; @@ -14,23 +15,18 @@ */ @Data -public class CodeSrchCondConfigVO extends BaseModelVO { +public class CodeSrchCondConfigVO extends CodeSrchCondConfig { private static final long serialVersionUID = -51655155561881523L; /** - * 绛涢�夊瓧娈� + * 鍏宠仈鐨勫弬鐓ч厤缃甶d */ - private String filterField; + private String configOid; /** * 绛涢�夌被鍨� */ - private String filterType; - - /** - * 绛涢�夌殑鍊� - */ - private String filterValue; + private String filterTypeText; } -- Gitblit v1.9.3