Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

cloud-model/src/main/java/com/hssx/cloudmodel/controller/InvitationRecordController.java

@@ -41,7 +41,5 @@ public class InvitationRecordController {
         msg = invitationRecordService.add(invitationRecord,token);
         return msg;
     }
-
-
 }
 

cloud-model/src/main/java/com/hssx/cloudmodel/entity/InvitationRecord.java

@@ -1,5 +1,7 @@
 package com.hssx.cloudmodel.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.time.LocalDateTime;
@@ -8,7 +10,7 @@ import java.io.Serializable;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author 吴涛涛
@@ -22,7 +24,7 @@ public class InvitationRecord extends Model<InvitationRecord> {
     /**
      * 项目邀请人员记录表主键
      */
-    @TableField("id")
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     /**

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/InvitationRecordServiceImpl.java

@@ -50,7 +50,7 @@ public class InvitationRecordServiceImpl extends ServiceImpl<InvitationRecordMap
     @Override
     public HttpRespMsg add(InvitationRecord invitationRecord,String token) {
         HttpRespMsg msg = new HttpRespMsg();
-        Project project = projectMapper.selectById(invitationRecord.getId());
+        Project project = projectMapper.selectById(invitationRecord.getProjectId());
         InvitationRecordVO vo = new InvitationRecordVO();
         vo.setProjectName(project.getProjectName());
         vo.setCompanyName(project.getOwnerCompanyName());