diff --git a/src/main/java/com/pms/ocp/controller/ModelBaseController.java b/src/main/java/com/pms/ocp/controller/ModelBaseController.java
index d5cba4a647d8d8d0ba8004c3c10362b317d44c5a..1bcd7b9754996289fb31bf4bde629a72f9a93667 100644
--- a/src/main/java/com/pms/ocp/controller/ModelBaseController.java
+++ b/src/main/java/com/pms/ocp/controller/ModelBaseController.java
@@ -1,12 +1,9 @@
 package com.pms.ocp.controller;
 
-import com.pms.ocp.common.constants.CodeEnum;
 import com.pms.ocp.model.dto.ModelIssueDTO;
 import com.pms.ocp.model.dto.ModelPropertyDTO;
 import com.pms.ocp.model.entity.Model;
 import com.pms.ocp.model.entity.ModelNote;
-import com.pms.ocp.model.entity.ModelProperty;
-import com.pms.ocp.model.entity.ModelType;
 import com.pms.ocp.model.vo.ResponseVO;
 import com.pms.ocp.service.*;
 import io.swagger.annotations.Api;
diff --git a/src/main/java/com/pms/ocp/controller/ModelClassifyController.java b/src/main/java/com/pms/ocp/controller/ModelClassifyController.java
index 126c214bf804c48b0749ea876b9cd1af6b5c1dbe..1eec46e212f84d539152e1bced5b249b2849527b 100644
--- a/src/main/java/com/pms/ocp/controller/ModelClassifyController.java
+++ b/src/main/java/com/pms/ocp/controller/ModelClassifyController.java
@@ -1,7 +1,7 @@
 package com.pms.ocp.controller;
 
 import com.github.pagehelper.PageInfo;
-import com.pms.ocp.model.entity.ModelType;
+import com.pms.ocp.model.entity.ModelClassify;
 import com.pms.ocp.model.vo.OcpModelGroupVO;
 import com.pms.ocp.model.vo.ResponseVO;
 import com.pms.ocp.service.ModelClassifyService;
@@ -68,7 +68,7 @@ public class ModelClassifyController {
      **/
     @ApiOperation("新增")
     @PostMapping("/insert")
-    public ResponseVO insert(@RequestBody List<ModelType> list) {
+    public ResponseVO insert(@RequestBody List<ModelClassify> list) {
         return modelClassifyService.insert(list);
     }
 
@@ -82,7 +82,7 @@ public class ModelClassifyController {
      **/
     @ApiOperation("修改")
     @PostMapping("/update")
-    public ResponseVO update(@RequestBody List<ModelType> list) {
+    public ResponseVO update(@RequestBody List<ModelClassify> list) {
         return modelClassifyService.update(list);
     }
 }
diff --git a/src/main/java/com/pms/ocp/mapper/ModelTypeMapper.java b/src/main/java/com/pms/ocp/mapper/ModelTypeMapper.java
index b7ea2b07eb2fdcf1ec5b142802c75a48a5911a03..6d16d81194f84aed95cd78173270ecfd3977f2a8 100644
--- a/src/main/java/com/pms/ocp/mapper/ModelTypeMapper.java
+++ b/src/main/java/com/pms/ocp/mapper/ModelTypeMapper.java
@@ -1,8 +1,7 @@
 package com.pms.ocp.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.pms.ocp.model.entity.Model;
-import com.pms.ocp.model.entity.ModelType;
+import com.pms.ocp.model.entity.ModelClassify;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -12,5 +11,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 
 @Mapper
-public interface ModelTypeMapper extends BaseMapper<ModelType> {
+public interface ModelTypeMapper extends BaseMapper<ModelClassify> {
 }
diff --git a/src/main/java/com/pms/ocp/mapper/OcpModelGroupMapper.java b/src/main/java/com/pms/ocp/mapper/OcpModelGroupMapper.java
index 8cb94989d8da046134b0897e93b74d88c4ddf3cc..b73521d48321c1055968014eafd2c35d5c2c4656 100644
--- a/src/main/java/com/pms/ocp/mapper/OcpModelGroupMapper.java
+++ b/src/main/java/com/pms/ocp/mapper/OcpModelGroupMapper.java
@@ -1,7 +1,7 @@
 package com.pms.ocp.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.pms.ocp.model.entity.ModelType;
+import com.pms.ocp.model.entity.ModelClassify;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -10,5 +10,5 @@ import org.apache.ibatis.annotations.Mapper;
  * @date 2022/3/9 9:47
  */
 @Mapper
-public interface OcpModelGroupMapper extends BaseMapper<ModelType> {
+public interface OcpModelGroupMapper extends BaseMapper<ModelClassify> {
 }
diff --git a/src/main/java/com/pms/ocp/model/dto/ModelIssueDTO.java b/src/main/java/com/pms/ocp/model/dto/ModelIssueDTO.java
index feaaff48121a788601428249ed953c9678cea9c3..3e50e510d7ae5191ca7bb0a2ad98f8595d4b9608 100644
--- a/src/main/java/com/pms/ocp/model/dto/ModelIssueDTO.java
+++ b/src/main/java/com/pms/ocp/model/dto/ModelIssueDTO.java
@@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import java.sql.Date;
 import java.time.LocalDateTime;
 
 /**
diff --git a/src/main/java/com/pms/ocp/model/entity/ModelType.java b/src/main/java/com/pms/ocp/model/entity/ModelClassify.java
similarity index 98%
rename from src/main/java/com/pms/ocp/model/entity/ModelType.java
rename to src/main/java/com/pms/ocp/model/entity/ModelClassify.java
index 364f93b9eacebf357b15daadda240e3c49b3a518..888534cfd2abe5a38ad0825d3392232278be212d 100644
--- a/src/main/java/com/pms/ocp/model/entity/ModelType.java
+++ b/src/main/java/com/pms/ocp/model/entity/ModelClassify.java
@@ -18,7 +18,7 @@ import java.util.Date;
 @Data
 @Accessors(chain = true)
 @TableName("ocp_model_group")
-public class ModelType {
+public class ModelClassify {
 
     /**
      * 模型分类编号
diff --git a/src/main/java/com/pms/ocp/service/ModelClassifyService.java b/src/main/java/com/pms/ocp/service/ModelClassifyService.java
index e895d0b79fceddcad2fae988fdf98c172490b9ee..7975b41dc0a0ba419200c9faa4ed65554e7ebccf 100644
--- a/src/main/java/com/pms/ocp/service/ModelClassifyService.java
+++ b/src/main/java/com/pms/ocp/service/ModelClassifyService.java
@@ -1,6 +1,6 @@
 package com.pms.ocp.service;
 
-import com.pms.ocp.model.entity.ModelType;
+import com.pms.ocp.model.entity.ModelClassify;
 import com.pms.ocp.model.vo.OcpModelGroupVO;
 import com.pms.ocp.model.vo.ResponseVO;
 
@@ -14,9 +14,9 @@ import java.util.List;
 public interface ModelClassifyService {
     ResponseVO<List<OcpModelGroupVO>> getModelNavigation();
 
-    ResponseVO insert(List<ModelType> list);
+    ResponseVO insert(List<ModelClassify> list);
 
     ResponseVO subclassDetailsList(int currentPage,int pageSize,String parentGroupCode,String subclassGroupName);
 
-    ResponseVO update(List<ModelType> list);
+    ResponseVO update(List<ModelClassify> list);
 }
diff --git a/src/main/java/com/pms/ocp/service/ModelGroupService.java b/src/main/java/com/pms/ocp/service/ModelGroupService.java
index e8b3acf050a3c71ab1669030bfdb5f237818672a..2f0ed05e48ba6f379d4316a04f86d0958e84231f 100644
--- a/src/main/java/com/pms/ocp/service/ModelGroupService.java
+++ b/src/main/java/com/pms/ocp/service/ModelGroupService.java
@@ -1,15 +1,15 @@
 package com.pms.ocp.service;
 
-import com.pms.ocp.model.entity.ModelType;
+import com.pms.ocp.model.entity.ModelClassify;
 import com.pms.ocp.model.vo.ResponseVO;
 
 public interface ModelGroupService {
 
     ResponseVO getModelType();
 
-    ResponseVO createModelType(ModelType modelType);
+    ResponseVO createModelType(ModelClassify modelClassify);
 
     ResponseVO deleteModelType(String modelTypeId);
 
-    ResponseVO updateModelType(ModelType modelType);
+    ResponseVO updateModelType(ModelClassify modelClassify);
 }
diff --git a/src/main/java/com/pms/ocp/service/ModelIssueService.java b/src/main/java/com/pms/ocp/service/ModelIssueService.java
index 65e50b6d3cac8bfa31cf284ad16f4f86a1e746d5..250f29fc08049195ad3a3898b4ddea6493fb79de 100644
--- a/src/main/java/com/pms/ocp/service/ModelIssueService.java
+++ b/src/main/java/com/pms/ocp/service/ModelIssueService.java
@@ -2,7 +2,6 @@ package com.pms.ocp.service;
 
 import com.pms.ocp.model.dto.ModelIssueDTO;
 import com.pms.ocp.model.entity.ModelIssue;
-import com.pms.ocp.model.entity.ModelType;
 
 import java.util.List;
 
diff --git a/src/main/java/com/pms/ocp/service/ModelService.java b/src/main/java/com/pms/ocp/service/ModelService.java
index 82ab6e636628ad4ad3cf6fd58d914233d8e18739..6eab59fdfc58a12e98e759214874313fcb6bec1e 100644
--- a/src/main/java/com/pms/ocp/service/ModelService.java
+++ b/src/main/java/com/pms/ocp/service/ModelService.java
@@ -1,12 +1,8 @@
 package com.pms.ocp.service;
 
-import com.pms.ocp.common.constants.CodeEnum;
 import com.pms.ocp.model.entity.Model;
-import com.pms.ocp.model.entity.ModelType;
 import com.pms.ocp.model.vo.ResponseVO;
 
-import java.util.List;
-
 /**
  * @Auther: wangjian
  * @Date: 2022/2/22 16:03
diff --git a/src/main/java/com/pms/ocp/service/ModelTypeService.java b/src/main/java/com/pms/ocp/service/ModelTypeService.java
index 1424e7188d3c53a03bcc93130740b68b94fc941f..26a59680f32b17c6feb454bb91fb6e047fc8a8fa 100644
--- a/src/main/java/com/pms/ocp/service/ModelTypeService.java
+++ b/src/main/java/com/pms/ocp/service/ModelTypeService.java
@@ -1,6 +1,6 @@
 package com.pms.ocp.service;
 
-import com.pms.ocp.model.entity.ModelType;
+import com.pms.ocp.model.entity.ModelClassify;
 
 import java.util.List;
 
@@ -14,10 +14,10 @@ public interface ModelTypeService {
     /**
      * 创建模型分类
      *
-     * @param modelType
+     * @param modelClassify
      * @return
      */
-    Integer createModelType(ModelType modelType);
+    Integer createModelType(ModelClassify modelClassify);
 
     /**
      * 删除模型分类
@@ -30,10 +30,10 @@ public interface ModelTypeService {
     /**
      * 更新模型分类
      *
-     * @param modelType
+     * @param modelClassify
      * @return
      */
-    Integer updateModelType(ModelType modelType);
+    Integer updateModelType(ModelClassify modelClassify);
 
     /**
      * 获取模型分类
@@ -41,7 +41,7 @@ public interface ModelTypeService {
      * @param
      * @return
      */
-    List<ModelType> getModelTypeList();
+    List<ModelClassify> getModelTypeList();
 
     /**
      * 获取模型分类列表
@@ -49,5 +49,5 @@ public interface ModelTypeService {
      * @param modelId
      * @return
      */
-    ModelType getModelType(String modelId);
+    ModelClassify getModelType(String modelId);
 }
diff --git a/src/main/java/com/pms/ocp/service/OcpModelGroupService.java b/src/main/java/com/pms/ocp/service/OcpModelGroupService.java
index 8a8677ddcabe8a77c408ccd878583d993af5fc4f..05de174e2f7378da87f65a7785448bf43b9c6487 100644
--- a/src/main/java/com/pms/ocp/service/OcpModelGroupService.java
+++ b/src/main/java/com/pms/ocp/service/OcpModelGroupService.java
@@ -1,12 +1,12 @@
 package com.pms.ocp.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.pms.ocp.model.entity.ModelType;
+import com.pms.ocp.model.entity.ModelClassify;
 
 /**
  * @author huxiuwu
  * @version 1.0
  * @date 2022/3/9 9:44
  */
-public interface OcpModelGroupService extends IService<ModelType> {
+public interface OcpModelGroupService extends IService<ModelClassify> {
 }
diff --git a/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java
index 386fab64feb2fc7e79e846a5a79bc05ce65db670..f4be2d57375c9c32aee0d20da95e063593bdb41a 100644
--- a/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java
@@ -6,7 +6,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.pms.ocp.common.constants.CodeEnum;
 import com.pms.ocp.mapper.ModelClassifyMapper;
-import com.pms.ocp.model.entity.ModelType;
+import com.pms.ocp.model.entity.ModelClassify;
 import com.pms.ocp.model.vo.OcpModelGroupVO;
 import com.pms.ocp.model.vo.ResponseVO;
 import com.pms.ocp.service.ModelClassifyService;
@@ -88,7 +88,7 @@ public class ModelClassifyServiceImpl implements ModelClassifyService {
      * @date 2022/3/9
      **/
     @Override
-    public ResponseVO update(List<ModelType> list) {
+    public ResponseVO update(List<ModelClassify> list) {
         boolean isUpdateSucceed = ocpService.saveOrUpdateBatch(list);
         if (!isUpdateSucceed) {
             ResponseVO.error(CodeEnum.UP_DATA_FAIL);
@@ -105,7 +105,7 @@ public class ModelClassifyServiceImpl implements ModelClassifyService {
      * @date 2022/3/9
      **/
     @Override
-    public ResponseVO insert(List<ModelType> list) {
+    public ResponseVO insert(List<ModelClassify> list) {
         boolean result = ocpService.saveBatch(list);
         if (!result) {
             return ResponseVO.error(CodeEnum.INSERT_FAIL);
diff --git a/src/main/java/com/pms/ocp/service/impl/ModelGroupServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelGroupServiceImpl.java
index 8e2413d17b1dbe919bae3be3ac1a6f5048ef742f..030d8d32e00f6a583e9b0c130bbd85c743d3f497 100644
--- a/src/main/java/com/pms/ocp/service/impl/ModelGroupServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/ModelGroupServiceImpl.java
@@ -3,7 +3,7 @@ package com.pms.ocp.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.pms.ocp.common.constants.CodeEnum;
 import com.pms.ocp.mapper.ModelTypeMapper;
-import com.pms.ocp.model.entity.ModelType;
+import com.pms.ocp.model.entity.ModelClassify;
 import com.pms.ocp.model.vo.ResponseVO;
 import com.pms.ocp.service.ModelGroupService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,18 +24,18 @@ public class ModelGroupServiceImpl implements ModelGroupService {
      */
     @Override
     public ResponseVO getModelType() {
-        QueryWrapper<ModelType> wrapper = new QueryWrapper<>();
-        List<ModelType> modelTypeList = modelTypeMapper.selectList(wrapper);
-        if(CollectionUtils.isEmpty(modelTypeList)){
+        QueryWrapper<ModelClassify> wrapper = new QueryWrapper<>();
+        List<ModelClassify> modelClassifyList = modelTypeMapper.selectList(wrapper);
+        if(CollectionUtils.isEmpty(modelClassifyList)){
             return ResponseVO.error("查询列表为空");
         }else{
-            return ResponseVO.ok(modelTypeList);
+            return ResponseVO.ok(modelClassifyList);
         }
     }
 
     @Override
-    public ResponseVO createModelType(ModelType modelType) {
-        int result = modelTypeMapper.insert(modelType);
+    public ResponseVO createModelType(ModelClassify modelClassify) {
+        int result = modelTypeMapper.insert(modelClassify);
         if(result>0){
             return ResponseVO.error(CodeEnum.SUCCESS);
         }else{
@@ -54,8 +54,8 @@ public class ModelGroupServiceImpl implements ModelGroupService {
     }
 
     @Override
-    public ResponseVO updateModelType(ModelType modelType) {
-        int result = modelTypeMapper.updateById(modelType);
+    public ResponseVO updateModelType(ModelClassify modelClassify) {
+        int result = modelTypeMapper.updateById(modelClassify);
         if (result > 0) {
             return ResponseVO.error(CodeEnum.SUCCESS);
         } else {
diff --git a/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java
index cb9b55118b7f426e63506d36b56a09c77e09c880..4ef894ce5b2b25989b424db7cf70e28ebd0ea48e 100644
--- a/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java
@@ -4,18 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.pms.ocp.common.constants.CodeEnum;
 import com.pms.ocp.mapper.ModelMapper;
 import com.pms.ocp.model.entity.Model;
-import com.pms.ocp.model.entity.ModelType;
 import com.pms.ocp.model.vo.ResponseVO;
 import com.pms.ocp.service.ModelService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.Collections;
 import java.util.List;
-import java.util.stream.Collectors;
-
-import static com.pms.ocp.common.constants.CodeEnum.NO_DATA;
 
 /**
  * @Auther: wangjian
diff --git a/src/main/java/com/pms/ocp/service/impl/ModelTypeServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelTypeServiceImpl.java
index 2ea908f30408439d66ef8ce475f987338a921ce9..7b82ed9d8024e74ba5e9b4210af78cfee505a2c5 100644
--- a/src/main/java/com/pms/ocp/service/impl/ModelTypeServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/ModelTypeServiceImpl.java
@@ -1,6 +1,6 @@
 package com.pms.ocp.service.impl;
 
-import com.pms.ocp.model.entity.ModelType;
+import com.pms.ocp.model.entity.ModelClassify;
 import com.pms.ocp.service.ModelTypeService;
 import org.springframework.stereotype.Service;
 
@@ -16,7 +16,7 @@ import java.util.List;
 public class ModelTypeServiceImpl implements ModelTypeService {
 
     @Override
-    public Integer createModelType(ModelType modelType) {
+    public Integer createModelType(ModelClassify modelClassify) {
         return null;
     }
 
@@ -26,17 +26,17 @@ public class ModelTypeServiceImpl implements ModelTypeService {
     }
 
     @Override
-    public Integer updateModelType(ModelType modelType) {
+    public Integer updateModelType(ModelClassify modelClassify) {
         return null;
     }
 
     @Override
-    public List<ModelType> getModelTypeList() {
+    public List<ModelClassify> getModelTypeList() {
         return null;
     }
 
     @Override
-    public ModelType getModelType(String modelId) {
+    public ModelClassify getModelType(String modelId) {
         return null;
     }
 }
diff --git a/src/main/java/com/pms/ocp/service/impl/OcpModelGroupServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpModelGroupServiceImpl.java
index 6f379f640275d285fc722f3d5548b0f4f0937315..4c71e2c5a76cdd27d182229cc7ef5587e64b79bb 100644
--- a/src/main/java/com/pms/ocp/service/impl/OcpModelGroupServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/OcpModelGroupServiceImpl.java
@@ -2,7 +2,7 @@ package com.pms.ocp.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pms.ocp.mapper.OcpModelGroupMapper;
-import com.pms.ocp.model.entity.ModelType;
+import com.pms.ocp.model.entity.ModelClassify;
 import com.pms.ocp.service.OcpModelGroupService;
 import org.springframework.stereotype.Service;
 
@@ -12,5 +12,5 @@ import org.springframework.stereotype.Service;
  * @date 2022/3/9 9:45
  */
 @Service
-public class OcpModelGroupServiceImpl extends ServiceImpl<OcpModelGroupMapper,ModelType>implements OcpModelGroupService {
+public class OcpModelGroupServiceImpl extends ServiceImpl<OcpModelGroupMapper, ModelClassify>implements OcpModelGroupService {
 }