Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/dto/ProjectCollectionSaveDTO.java

@@ -70,6 +70,9 @@ public class ProjectCollectionSaveDTO implements Serializable {
     @ApiModelProperty("项目类型 1:建设 2:运维")
     private Integer projectType;
 
+    @ApiModelProperty("建设类型 1软件，2硬件，3服务")
+    private Integer constructionType;
+
     @ApiModelProperty("是否首次新建 0:否 1:是")
     private Integer isFirst;
 

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/ProjectCollection.java

@@ -70,6 +70,9 @@ public class ProjectCollection implements Serializable {
     @ApiModelProperty("项目类型 1:建设 2:运维")
     private Integer projectType;
 
+    @ApiModelProperty("建设类型 1软件，2硬件，3服务")
+    private Integer constructionType;
+
     @ApiModelProperty("是否首次新建 0:否 1:是")
     private Integer isFirst;
 

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectCollectionVO.java

@@ -70,6 +70,9 @@ public class ProjectCollectionVO implements Serializable {
     @ApiModelProperty("项目类型 1:建设 2:运维")
     private Integer projectType;
 
+    @ApiModelProperty("建设类型 1软件，2硬件，3服务")
+    private Integer constructionType;
+
     @ApiModelProperty("是否首次新建 0:否 1:是")
     private Integer isFirst;