From 70fb56a9fb61f70ccc55fcbc085b470e9423858a Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期一, 05 六月 2023 16:16:35 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSrchCondConfig.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSrchCondConfig.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSrchCondConfig.java
index 4b7f109..7dff2bc 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSrchCondConfig.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSrchCondConfig.java
@@ -1,5 +1,7 @@
package com.vci.ubcs.code.entity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
@@ -15,9 +17,15 @@
@Data
@TableName("PL_CODE_SRCHCONDCONFIG")
@ApiModel(value = "CodeSrchCondConfig瀵硅薄", description = "缂栫爜瑙勫垯绠＄悊-寮曠敤鐮佹-鍙傜収閰嶇疆-鎼滅储鏉′欢閰嶇疆")
-public class CodeSrchCondConfig extends BaseModel {
+public class CodeSrchCondConfig {
private static final long serialVersionUID = -51655155561881523L;
+
+ /**
+ * 涓婚敭
+ */
+ @TableId(value = "OID",type = IdType.ASSIGN_UUID)
+ private String oid;
/**
* 绛涢�夊瓧娈�
@@ -35,9 +43,13 @@
private String filterValue;
/**
+ * 鍏宠仈鐨勫弬鐓ч厤缃富閿�
+ */
+ private String referConfigOid;
+
+ /**
* 鎺掑簭
*/
private Integer orderNum;
-
}
--
Gitblit v1.9.3