Merge branch 'master' of http://git.ningdatech.com/liushuai/project-management into dev

 Conflicts:

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

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

@@ -417,6 +417,10 @@ public class ProjectDetailVO {
     @Compare("建设周期（月）")
     private Integer originBuildCycle;
 
+    @ApiModelProperty("计划验收时间(有可能是延期后的)")
+    @Compare("计划验收时间")
+    private LocalDateTime planAcceptanceTime;
+
     public String getVersionStr() {
         if (Objects.nonNull(this.newest) && this.newest) {
             this.versionStr = "当前版本";