From 24fab86e819834e06406900a05cf25958faad0ce Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期一, 29 五月 2023 18:42:37 +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 |   10 ++++++++--
 1 files changed, 8 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 1c1faa5..2493e14 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,6 +1,7 @@
 package com.vci.ubcs.code.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.yulichang.annotation.EntityMapping;
 import com.vci.ubcs.starter.revision.model.BaseModel;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
@@ -39,9 +40,9 @@
 	private String sort;
 
 	/**
-	 * 鎺掑簭瀛楁
+	 * 鏄剧ず鐨勫睘鎬т腑鐨�-鎺掑簭瀛楁
 	 */
-	private String sortField;
+	private String attrSortField;
 
 	/**
 	 * 瀛楁瀹藉害
@@ -59,6 +60,11 @@
 	private String templet;
 
 	/**
+	 * 鏄惁蹇�熸煡璇�
+	 */
+	private String isQuery;
+
+	/**
 	 * 鍏宠仈鐨勫弬鐓ч厤缃富閿�
 	 */
 	private String referConfigOid;

--
Gitblit v1.9.3