Merge remote-tracking branch 'origin/master'

src/main/java/com/liang/controller/PrjAnnualbudgetController.java

@@ -560,7 +560,7 @@ public class PrjAnnualbudgetController extends BaseController {
             paraMap.put("xm", annualbudget.getRws().toString());
             paraMap.put("nf", annualbudget.getNf());
         }
-        double ndczje;
+        Double ndczje;
         if("国网公司科技项目".equals((annualbudget.getXmlxmc()))){
             ndczje= prjFeeschemeService.getNdFeeSchemeofDKY(paraMap);
         }else {