Merge remote-tracking branch 'origin/master'

# Conflicts:
#	dntd-common/src/main/java/com/dky/utils/entity/DevSpec.java

dntd-tool/src/main/java/com/dky/Test.java

@@ -14,15 +14,15 @@ public class Test {
         DevSpec specObj1 = new DevSpec();
         DevSpec specObj2 = new DevSpec();
         DevSpec specObj3 = new DevSpec();
-        specObj1.setId(1);
-        specObj1.setDevType("直热式电锅炉");
-        specObj1.setCapacity(1.5);
-        specObj2.setId(2);
-        specObj2.setDevType("直热式电锅炉");
-        specObj2.setCapacity(2.5);
-        specObj3.setId(3);
-        specObj3.setDevType("直热式电锅炉");
-        specObj3.setCapacity(3.0);
+        specObj1.setId(1L);
+        specObj1.setTechnologyType("直热式电锅炉");
+        specObj1.setHeatingArea(1.5);
+        specObj2.setId(2L);
+        specObj2.setTechnologyType("直热式电锅炉");
+        specObj2.setHeatingArea(2.5);
+        specObj3.setId(3L);
+        specObj3.setTechnologyType("直热式电锅炉");
+        specObj3.setHeatingArea(3.0);
         devSpecList.add(specObj1);
         devSpecList.add(specObj2);
         devSpecList.add(specObj3);
@@ -57,7 +57,7 @@ public class Test {
                 .put("deviceEnergyType", "1")
                 .put("lastYearFee", "76.25"));
         String key = "GWnQ4RqqTc8n1Uj59xLoUq0YsJLmzgyVzBvI35uj+DaDjdU0HZoU2fCd33JFsVG+3tWpkuojap/b5eeutSp6d4x4juou3yhCF7yhLBqYs1tdr2DF5QqL8uTsLJuKf1Ys8iufExureFAQw+qjMN+W5UlKE5id39PDi2nsPJGUbwkrvkywf2wqaqwZy+i/QBOl";
-        JSONObject jsonObject = modelTool.exeModel2Report(param,key);//exeModel2Report
+        JSONObject jsonObject = ModelTool.exeModel2Report(param,key);//exeModel2Report
         System.out.println(jsonObject.toString());
     }
 }