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

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java

@@ -212,6 +212,8 @@ public class ProjectLibManage {
                     && w.getSuperOrgCode().equals(finalUser.getEmpPosUnitCode())) {
                 item.setCanPreDeclared(Boolean.TRUE);
             }
+            item.setApprovedAmount(w.getApprovalAmount());
+            item.setAnnualPlanAmount(w.getAnnualPlanAmount());
             item.setPrePlanProjectId(w.getPrePlanProjectId());
             setTag(item,finalTagMap,finalTagNameMap);
             return item;

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java

@@ -99,6 +99,7 @@ public class ProjectRenewalFundManage {
         vo.setStage(project.getStage());
         vo.setStatus(project.getStatus());
         vo.setBuildOrgName(project.getBuildOrgName());
+        vo.setAnnualPaymentAmount(project.getAnnualPlanAmount());
         return vo;
     }