Merge remote-tracking branch 'cs/master'

assistMg/src/main/java/com/hotent/project/manager/impl/CostProjectApprovalManagerImpl.java

@@ -664,6 +664,9 @@ public class CostProjectApprovalManagerImpl extends BaseManagerImpl<CostProjectA
                 record.setCurrentNode(userTask.getCurrentNode());
                 record.setCurrentNodeName(NodeConstant.getNodeValueByKey(userTask.getCurrentNode()) + "-" + TaskStatusConstant.getStatusNameByCode(userTask.getStatus()));
             }
+
+            //设置监审单位
+            record.setAuditedUnitName(unit.getUnitName());
         }
         return result;
     }

assistMg/src/main/java/com/hotent/project/model/CostProjectApproval.java

@@ -3,16 +3,15 @@ package com.hotent.project.model;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.hotent.base.entity.BaseModel;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.hotent.base.entity.BaseModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 /**
  * 成本监审立项主表
  *