Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/meeting/controller/MeetingController.java

@@ -89,9 +89,9 @@ public class MeetingController {
         return meetingManage.meetingListForLeave(req);
     }
 
-    @ApiOperation("会议详情-基本信息")
+    @ApiOperation("项目详情-基本信息")
     @GetMapping("/basicInfo/{meetingId}")
-    @WebLog(value = "会议详情-基本信息")
+    @WebLog(value = "项目详情-基本信息",response = true,project = true)
     public MeetingDetailBasicVO meetingBasic(@PathVariable Long meetingId) {
         return meetingManage.getMeetingDetail(meetingId);
     }

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/converter/ApplicationConverter.java

@@ -67,6 +67,8 @@ public class ApplicationConverter {
                 .projectApplyFile(convertFile(projectInfo.getProjectApplicationForm(),fileService))
                 .researchReport(convertFile(projectInfo.getPreliminaryPlanFile(),fileService))
                 .applicationInfo(convertApplications(applications,fileService))
+                //条线单位 先写死
+                .lineManageUnit("GO_3a8d76d825a849488916e618ff2f7474")
                 .build();
     }
 

pmapi/src/main/java/com/ningdatech/pmapi/provincial/model/dto/ProvincialProjectDTO.java

@@ -123,4 +123,6 @@ public class ProvincialProjectDTO implements Serializable {
     @ApiModelProperty("app信息")
     private List<ProvincialApplicationDTO> applicationInfo;
 
+    @ApiModelProperty("条线单位 先写死")
+    private String lineManageUnit;
 }