From 0178d9e48a87629f8b5f5f5075409d9ab6d29d87 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 30 八月 2023 17:24:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeShowFieldConfig.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeShowFieldConfig.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeShowFieldConfig.java
index cfc32c2..d3fb628 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeShowFieldConfig.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeShowFieldConfig.java
@@ -1,9 +1,15 @@
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.github.yulichang.annotation.EntityMapping;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
+
+import java.io.Serializable;
/**
* 缂栫爜瑙勫垯绠＄悊-寮曠敤鐮佹-鍙傜収閰嶇疆-鏄剧ず灞炴�ч厤缃�
@@ -12,11 +18,17 @@
* @date 2023/5/19 17:35
*/
@Data
-@TableName("PL_CODE_SHOWFIELDCONFIG")
+@TableName(CodeTableNameConstant.PL_CODE_SHOWFIELDCONFIG)
@ApiModel(value = "CodeShowFieldConfig瀵硅薄", description = "缂栫爜瑙勫垯绠＄悊-寮曠敤鐮佹-鍙傜収閰嶇疆-鏄剧ず灞炴�ч厤缃�")
-public class CodeShowFieldConfig extends BaseModel {
+public class CodeShowFieldConfig implements Serializable {
private static final long serialVersionUID = -71135592796848692L;
+
+ /**
+ * 涓婚敭
+ */
+ @TableId(value = "OID",type = IdType.ASSIGN_UUID)
+ private String oid;
/**
* 鍒楀瓧娈�
@@ -39,19 +51,19 @@
private String sort;
/**
- * 鎺掑簭瀛楁
+ * 鏄剧ず鐨勫睘鎬т腑鐨�-鎺掑簭瀛楁
*/
- private String sortField;
+ private String attrSortField;
/**
* 瀛楁瀹藉害
*/
- private Long width;
+ private Integer width;
/**
* 鍒楀浐瀹氫綅缃�
*/
- private String fixedText;
+ private String fixedPosition;
/**
* js鏄剧ず浠ｇ爜
@@ -59,6 +71,16 @@
private String templet;
/**
+ * 鏄惁蹇�熸煡璇�
+ */
+ private String isQuery;
+
+ /**
+ * 鍏宠仈鐨勫弬鐓ч厤缃富閿�
+ */
+ private String referConfigOid;
+
+ /**
* 鎺掑簭
*/
private Integer orderNum;
--
Gitblit v1.9.3