From 16ecc185997ebf5b82432ec37783777297924e7d Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Thu, 21 Apr 2022 14:37:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E8=A1=A8=E6=9B=B4=E6=96=B0=E9=A1=B9=E7=9B=AE=E5=90=8D=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/modules/project/entity/ProjectLibraryBase.java  | 2 ++
 .../modules/project/mapper/xml/ProjectLibraryBaseMapper.xml  | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
index 6bc0aea30..b521d4bc8 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
@@ -33,6 +33,8 @@ public class ProjectLibraryBase implements Serializable {
     private java.lang.String id;
 
     /**项目名称*/
+    private java.lang.String projectNameId;
+    @TableField(exist = false)
     private java.lang.String projectName;
 
     /**目标市场*/
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
index a96ebddaf..9743fac94 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml
@@ -4,7 +4,7 @@
     <resultMap id="ProjectLibraryBaseResultMap" type="com.jero.modules.project.entity.ProjectLibraryBase">
         <id column="id" property="id" />
 
-        <result column="project_name" property="projectName" />
+        <result column="project_name_id" property="projectNameId" />
         <result column="target_market" property="targetMarket" />
         <result column="project_status" property="projectStatus" />
         <result column="studio_engineer" property="studioEngineer" />
@@ -24,6 +24,7 @@
     <sql id="select_item">
         select
             plb.id,
+            plb.project_name_id,
             pni.project_name as project_name,
             plb.target_market,
             plb.project_status,
@@ -41,7 +42,7 @@
             plb.update_by,
             plb.update_time
         from project_library_base as plb
-        left join project_name_info as pni on  plb.project_name=pni.id
+        left join project_name_info as pni on  plb.project_name_id=pni.id
         left join sys_user as studiouser on plb.studio_engineer=studiouser.id
     </sql>