Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareChoiceAction.java

@@ -30,7 +30,7 @@ public class ProjectDeclareChoiceAction implements Action<ProjectStatusEnum, Pro
             if (StateMachineUtils.isCityProject(project) && StateMachineUtils.judgeDeclareAmount(project)){
                 project.setStatus(ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS_SUCCESS.getCode());
             }else {
-                project.setStatus(ProjectStatusEnum.PRE_APPLYING.getCode());
+                project.setStatus(ProjectStatusEnum.PENDING_PREQUALIFICATION.getCode());
             }
         }
     }

pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/event/ProjectStatusChangeEvent.java

@@ -124,7 +124,7 @@ public enum ProjectStatusChangeEvent {
      */
     JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS_WITHDRAW(null, null, ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS.getCode()),
     /**
-     * 预审中时被撤回(项目状态进入：待预审选择，，有判断条件：市级项目且申报金额大于1000万项目状态变为：省级部门联审中；否则项目状态变为：预审中)
+     * 预审中时被撤回(项目状态进入：待预审选择，，有判断条件：市级项目且申报金额大于1000万项目状态变为：省级部门联审通过；否则项目状态变为：待预审)
      */
     PRE_APPLYING_WITHDRAW(null, null, ProjectStatusEnum.PRE_APPLYING.getCode()),
     /**