From c1ebadf9610980f70d191c9902bf1c57f15925a5 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 6 Apr 2023 16:41:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=A4=B4--?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_2nd_period.sql                    | 3 ++-
 .../main/java/com/jero/modules/head/entity/HeadCustomEO.java   | 3 +++
 .../modules/head/service/impl/HeadCustomEOServiceImpl.java     | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql
index 040cac9f4..721f6328c 100644
--- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql
+++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql
@@ -486,4 +486,5 @@ ADD COLUMN `click3` varchar(255) NULL COMMENT '动态表头使用' AFTER `click2
 ADD COLUMN `click4` varchar(255) NULL COMMENT '动态表头使用' AFTER `click3`,
 ADD COLUMN `click5` varchar(255) NULL COMMENT '动态表头使用' AFTER `click4`,
 ADD COLUMN `click6` varchar(255) NULL COMMENT '动态表头使用' AFTER `click5`,
-ADD COLUMN `db_field_name` varchar(255) NULL COMMENT '动态表头使用' AFTER `click6`;
+ADD COLUMN `db_field_name` varchar(255) NULL COMMENT '动态表头使用' AFTER `click6`,
+ADD COLUMN `db_field_txt` varchar(255) NULL COMMENT '动态表头使用' AFTER `db_field_name`;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/entity/HeadCustomEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/entity/HeadCustomEO.java
index d1eef12cd..1e6d52d22 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/entity/HeadCustomEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/entity/HeadCustomEO.java
@@ -129,6 +129,9 @@ public class HeadCustomEO implements Comparable<HeadCustomEO> {
     @ApiModelProperty(value = "动态表头使用")
     private String dbFieldName;
 
+    @ApiModelProperty(value = "动态表头使用")
+    private String dbFieldTxt;
+
     @Override
     public int compareTo(HeadCustomEO o) {
         return Integer.valueOf(this.getSort())-Integer.valueOf(o.getSort());//升序
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java
index 105533937..bd2e9990c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java
@@ -174,6 +174,7 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
         headCustomEOTemp.setClick5(headCustomEO.getClick5());
         headCustomEOTemp.setClick6(headCustomEO.getClick6());
         headCustomEOTemp.setDbFieldName(headCustomEO.getDbFieldName());
+        headCustomEOTemp.setDbFieldTxt(headCustomEO.getDbFieldTxt());
         return headCustomEOTemp;
     }
 
@@ -340,6 +341,7 @@ public class HeadCustomEOServiceImpl extends ServiceImpl<HeadCustomEOMapper, Hea
     private HeadCustomVO getHeadCustomVO(String cut, HeadCustomEO headCustomEO, HeadCustomVO headCustomVO) {
         headCustomVO.setDataIndex(headCustomEO.getField());
         headCustomVO.setDb_field_name(headCustomEO.getDbFieldName());
+        headCustomVO.setDb_field_txt(headCustomEO.getDbFieldTxt());
         headCustomVO.setSortParams(headCustomEO.getSortParams());
         headCustomVO.setSort(headCustomEO.getSort());
         headCustomVO.setClick(headCustomEO.getClick());