From dbe1b807e2a0e4aaa37277b69c50dd69dc42dda2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期日, 25 六月 2023 10:34:36 +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/entity/CodeShowFieldConfig.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 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 2493e14..ab1e29d 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,10 +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;
 
 /**
  * 缂栫爜瑙勫垯绠$悊-寮曠敤鐮佹-鍙傜収閰嶇疆-鏄剧ず灞炴�ч厤缃�
@@ -13,13 +18,19 @@
  * @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;
+
+	/**
 	 * 鍒楀瓧娈�
 	 */
 	private String field;

--
Gitblit v1.9.3