diff --git a/src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java b/src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java
index 65f34ba219c9805e5f31faa75511c5e0eac85e0c..b44b390ced4216baa31a00269195c10ad214b1ad 100644
--- a/src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java
+++ b/src/main/java/com/pms/ocp/biz/impl/BizModelRequirementInfoServiceImpl.java
@@ -79,6 +79,7 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn
         modelBaseVersion.setOwnerCompanyCode(modelVersionRequirementDTO.getCompanyCode());
         modelBaseVersion.setModelUserId(modelVersionRequirementDTO.getUserId());
         modelBaseVersion.setModelUserName(modelVersionRequirementDTO.getUserName());
+        modelBaseVersion.setModelVersion((modelVersionRequirementDTO.getModelVersion() == null) ? "1" : String.valueOf(((Integer.valueOf(modelVersionRequirementDTO.getModelVersion()).intValue()) + 1)));
 
         modelRequirementService.createModelRequirement(modelRequirement);
 
@@ -97,6 +98,10 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn
         BeanUtils.copyProperties(modelPropertyVersionRequirementDTO, modelPropertyVersion);
         modelPropertyVersion.setRequirementCode(modelPropertyVersionRequirementDTO.getRequirementCode());
         modelPropertyVersion.setModelCode(modelPropertyVersionRequirementDTO.getModelCode());
+
+        modelPropertyVersion.setPropUserId(modelPropertyVersionRequirementDTO.getUserId());
+        modelPropertyVersion.setPropUserName(modelPropertyVersionRequirementDTO.getUserName());
+
         modelPropertyVersion.setPropCtime(LocalDateTime.now());
 
         modelPropertyVersionService.createModelPropertyVersion(modelPropertyVersion);
@@ -110,13 +115,14 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn
         ModelRequirement modelRequirement = new ModelRequirement();
         BeanUtils.copyProperties(modelVersionRequirementDTO, modelRequirement);
 
-//        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-//        modelRequirement.setCtime(LocalDateTime.parse(modelVersionRequirementDTO.getCtime().toString(), df));
-
         modelRequirement.setMtime(LocalDateTime.now());
 
         ModelBaseVersion modelBaseVersion = new ModelBaseVersion();
         BeanUtils.copyProperties(modelVersionRequirementDTO, modelBaseVersion);
+        modelBaseVersion.setOwnerCompanyCode(modelVersionRequirementDTO.getCompanyCode());
+        modelBaseVersion.setModelUserId(modelVersionRequirementDTO.getUserId());
+        modelBaseVersion.setModelUserName(modelVersionRequirementDTO.getUserName());
+        modelBaseVersion.setModelVersion((modelVersionRequirementDTO.getModelVersion() == null) ? "1" : String.valueOf(((Integer.valueOf(modelVersionRequirementDTO.getModelVersion()).intValue()) + 1)));
 
         modelRequirementService.updateModelRequirement(modelRequirement);
 
@@ -136,6 +142,11 @@ public class BizModelRequirementInfoServiceImpl implements BizModelRequirementIn
         ModelPropertyVersion modelPropertyVersion = new ModelPropertyVersion();
         BeanUtils.copyProperties(modelPropertyVersionRequirementDTO, modelPropertyVersion);
         modelPropertyVersion.setPropMtime(LocalDateTime.now());
+        modelPropertyVersion.setPropUserId(modelPropertyVersionRequirementDTO.getUserId());
+        modelPropertyVersion.setPropUserName(modelPropertyVersionRequirementDTO.getUserName());
+        modelPropertyVersion.setPropMtime(LocalDateTime.now());
+
+
         modelPropertyVersionService.updateModelPropertyVersion(modelPropertyVersion);
 
 
diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiModelRelMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiModelRelMapper.java
index 87c6803846c76df9d2d47c700c1feebaed345c2b..86d9abe76b653562901336e2dc167d8880a5120f 100644
--- a/src/main/java/com/pms/ocp/mapper/OcpApiModelRelMapper.java
+++ b/src/main/java/com/pms/ocp/mapper/OcpApiModelRelMapper.java
@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pms.ocp.model.entity.OcpApiModelRel;
 import org.apache.ibatis.annotations.Mapper;
 
-import java.util.List;
-
 @Mapper
 public interface OcpApiModelRelMapper extends BaseMapper<OcpApiModelRel> {
 
diff --git a/src/main/java/com/pms/ocp/model/dto/ModelPropertyVersionRequirementDTO.java b/src/main/java/com/pms/ocp/model/dto/ModelPropertyVersionRequirementDTO.java
index 31003f109746358846e284ffc0194cc8c065f659..c2430025e36a1c8499fa159ddf5f4edcc5a678dc 100644
--- a/src/main/java/com/pms/ocp/model/dto/ModelPropertyVersionRequirementDTO.java
+++ b/src/main/java/com/pms/ocp/model/dto/ModelPropertyVersionRequirementDTO.java
@@ -1,15 +1,9 @@
 package com.pms.ocp.model.dto;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDateTime;
 
 /**
  * @Auther: wangjian
@@ -25,9 +19,8 @@ public class ModelPropertyVersionRequirementDTO {
     /**
      * 主键
      */
-    @ApiModelProperty(value = "主键")
-    @TableId(value = "obj_id", type = IdType.ASSIGN_ID)
-    private String objId;
+//    @ApiModelProperty(value = "主键")
+//    private String objId;
 
     /**
      * 模型编码
@@ -112,18 +105,18 @@ public class ModelPropertyVersionRequirementDTO {
     /**
      * 创建时间
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime propCtime;
+//    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @ApiModelProperty(value = "创建时间")
+//    private LocalDateTime propCtime;
 
     /**
      * 修改时间
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiModelProperty(value = "修改时间")
-    private LocalDateTime propMtime;
+//    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @ApiModelProperty(value = "修改时间")
+//    private LocalDateTime propMtime;
 
     /**
      * 需求编码
@@ -134,8 +127,8 @@ public class ModelPropertyVersionRequirementDTO {
     /**
      * 需求简述
      */
-    @ApiModelProperty(value = "需求简述")
-    private String requirementDesc;
+//    @ApiModelProperty(value = "需求简述")
+//    private String requirementDesc;
 
     /**
      * 需求提报公司
@@ -158,24 +151,24 @@ public class ModelPropertyVersionRequirementDTO {
     /**
      * 创建时间
      */
-    @ApiModelProperty(value = "创建时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime ctime;
+//    @ApiModelProperty(value = "创建时间")
+//    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    private LocalDateTime ctime;
 
     /**
      * 修改时间
      */
-    @ApiModelProperty(value = "修改时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime mtime;
+//    @ApiModelProperty(value = "修改时间")
+//    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    private LocalDateTime mtime;
 
     /**
      * 需求审核状态0:未通过1:通过
      */
-    @ApiModelProperty(value = "需求审核状态0:未通过1:通过")
-    private Integer requirementStatus;
+//    @ApiModelProperty(value = "需求审核状态0:未通过1:通过")
+//    private Integer requirementStatus;
 
     /**
      * 推广类型 0:统推, 1：自建
diff --git a/src/main/java/com/pms/ocp/model/dto/ModelVersionRequirementDTO.java b/src/main/java/com/pms/ocp/model/dto/ModelVersionRequirementDTO.java
index f0bba811203989c88730ad980d12b99e2a3b6a8e..325d4b05cd2081c06f70a1f30249d720720e1ac2 100644
--- a/src/main/java/com/pms/ocp/model/dto/ModelVersionRequirementDTO.java
+++ b/src/main/java/com/pms/ocp/model/dto/ModelVersionRequirementDTO.java
@@ -3,13 +3,10 @@ package com.pms.ocp.model.dto;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
-import java.time.LocalDateTime;
 
 /**
  * @Auther: wangjian
@@ -73,42 +70,43 @@ public class ModelVersionRequirementDTO {
     /**
      * 公司编码
      */
-    @ApiModelProperty(value = "公司编码")
-    private String ownerCompanyCode;
+//    @ApiModelProperty(value = "公司编码")
+//    private String ownerCompanyCode;
 
     /**
-     * 排列顺序
+     * 提交人id
      */
-    @ApiModelProperty(value = "排列顺序")
-    private Integer modelOrderNo;
+//    @ApiModelProperty(value = "提交人id")
+//    private String modelUserId;
 
     /**
-     * 提交人id
+     * 提交人姓名
      */
-    @ApiModelProperty(value = "提交人id")
-    private String modelUserId;
+//    @ApiModelProperty(value = "提交人姓名")
+//    private String modelUserName;
 
     /**
-     * 提交人姓名
+     * 排列顺序
      */
-    @ApiModelProperty(value = "提交人姓名")
-    private String modelUserName;
+    @ApiModelProperty(value = "排列顺序")
+    private Integer modelOrderNo;
+
 
     /**
      * 创建时间
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime modelCtime;
+//    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @ApiModelProperty(value = "创建时间")
+//    private LocalDateTime modelCtime;
 
     /**
      * 修改时间
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiModelProperty(value = "修改时间")
-    private LocalDateTime modelMtime;
+//    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @ApiModelProperty(value = "修改时间")
+//    private LocalDateTime modelMtime;
 
     /**
      * 所属区域 1:生成控制大区 2:信息关联大区3:互联网大区
@@ -180,14 +178,14 @@ public class ModelVersionRequirementDTO {
     /**
      * 创建时间
      */
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime ctime;
+//    @ApiModelProperty(value = "创建时间")
+//    private LocalDateTime ctime;
 
     /**
      * 修改时间
      */
-    @ApiModelProperty(value = "修改时间")
-    private LocalDateTime mtime;
+//    @ApiModelProperty(value = "修改时间")
+//    private LocalDateTime mtime;
 
     /**
      * 需求审核状态0:未通过1:通过