From f1337986b28a2a0b26f35eabc4edb0ddd2d551c6 Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期二, 07 十一月 2023 17:25:11 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodeSrchCondConfigVO.java | 16 +++------------- 1 files changed, 3 insertions(+), 13 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..630b702 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,7 +1,7 @@ package com.vci.ubcs.code.vo; import com.baomidou.mybatisplus.annotation.TableName; -import com.vci.ubcs.code.vo.pagemodel.BaseModelVO; +import com.vci.ubcs.code.entity.CodeSrchCondConfig; import com.vci.ubcs.starter.revision.model.BaseModel; import io.swagger.annotations.ApiModel; import lombok.Data; @@ -14,23 +14,13 @@ */ @Data -public class CodeSrchCondConfigVO extends BaseModelVO { +public class CodeSrchCondConfigVO extends CodeSrchCondConfig { private static final long serialVersionUID = -51655155561881523L; /** - * 绛涢�夊瓧娈� - */ - private String filterField; - - /** * 绛涢�夌被鍨� */ - private String filterType; - - /** - * 绛涢�夌殑鍊� - */ - private String filterValue; + private String filterTypeText; } -- Gitblit v1.9.3