From 9474fadca23df051af1789b2078aca9c3163a017 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 05 六月 2023 17:05:54 +0800
Subject: [PATCH] 合并代码，解决代码冲突
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodeSrchCondConfigVO.java | 15 +++------------
1 files changed, 3 insertions(+), 12 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..f804e38 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,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