From 768e2e45beb22bada515746353b757f2eae0154e Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Wed, 26 Apr 2023 10:26:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../crm/api/projecttypedictionary/ProjectTypeDictionary.java    | 2 +-
 .../crm/api/projecttypedictionary/ProjectTypeDictionaryDto.java | 1 +
 .../biz/projecttypedictionary/ProjectTypeDictionaryService.java | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionary.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionary.java
index 94d5eab3..5bd1d05e 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionary.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionary.java
@@ -13,5 +13,5 @@ import lombok.Data;
 @ApiModel(value = "项目类型字典", description = "项目类型字典")
 @TableName("project_type_dictionary")
 public class ProjectTypeDictionary extends BaseEntity {
-    private String typeName;
+    private String projectType;
 }
diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryDto.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryDto.java
index 2f37cb7d..f5a210cf 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryDto.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projecttypedictionary/ProjectTypeDictionaryDto.java
@@ -15,4 +15,5 @@ public class ProjectTypeDictionaryDto implements Dto {
     private String id;
     private String sid;
     private String remarks;
+    private String projectType;
 }
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryService.java
index 6fe444b2..4ea4f4b6 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryService.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projecttypedictionary/ProjectTypeDictionaryService.java
@@ -41,6 +41,7 @@ public class ProjectTypeDictionaryService extends MybatisBaseService<ProjectType
     public ResultBean save(ProjectTypeDictionaryDto dto) {
         ResultBean rb=new ResultBean();
         ProjectTypeDictionary entity=new ProjectTypeDictionary();
+        dto.setProjectType(dto.getTypeName());
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         baseMapper.insert(entity);
         return rb.success().setMsg("保存项目类型成功");
@@ -48,6 +49,7 @@ public class ProjectTypeDictionaryService extends MybatisBaseService<ProjectType
     public ResultBean update(ProjectTypeDictionaryDto dto) {
         ResultBean rb=new ResultBean();
         String dtoSid = dto.getSid();
+        dto.setProjectType(dto.getTypeName());
         ProjectTypeDictionary entity=fetchBySid(dtoSid);
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         baseMapper.updateById(entity);