From 426cd61c707f13a471b56330b3ba7b588b6cb245 Mon Sep 17 00:00:00 2001 From: fujunling <2984387807@qq.com> Date: 星期四, 15 六月 2023 18:11:58 +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 | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 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 1c1faa5..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,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,9 +51,9 @@ private String sort; /** - * 鎺掑簭瀛楁 + * 鏄剧ず鐨勫睘鎬т腑鐨�-鎺掑簭瀛楁 */ - private String sortField; + private String attrSortField; /** * 瀛楁瀹藉害 @@ -59,6 +71,11 @@ private String templet; /** + * 鏄惁蹇�熸煡璇� + */ + private String isQuery; + + /** * 鍏宠仈鐨勫弬鐓ч厤缃富閿� */ private String referConfigOid; -- Gitblit v1.9.3