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/entity/MouldOperationDynamics.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 
 /**
@@ -49,6 +51,7 @@ public class MouldOperationDynamics extends Model<MouldOperationDynamics> {
      * 操作的时间
      */
     @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
     /**

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

@@ -13,4 +13,5 @@ import lombok.Data;
 public class InvitationRecordVO extends InvitationRecord {
     private String projectName;
     private String companyName;
+    private String account;
 }

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

@@ -56,6 +56,7 @@ public class InvitationRecordServiceImpl extends ServiceImpl<InvitationRecordMap
         vo.setCompanyName(project.getOwnerCompanyName());
         User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", token));
         User invitee = userMapper.selectById(invitationRecord.getInviteeId());
+        vo.setAccount(invitee.getAccount());
         if(null == token){
             InvitationRecord record = invitationRecordMapper.selectOne(new QueryWrapper<InvitationRecord>()
                     .eq("operator_id", invitationRecord.getOperatorId())