Merge remote-tracking branch 'origin/master'

src/main/java/com/qyft/gd/service/CMDService.java

@@ -95,7 +95,7 @@ public class CMDService {
 // 开始加热
     private Boolean startHeat(CMDForm cmdForm) {
         List<Supplier<Boolean>> cmdList = new ArrayList<>();
-        cmdList.add(() -> deviceService.startHeating((String) cmdForm.getParams().get("heaterId"),(Double) cmdForm.getParams().get("time")));
+        cmdList.add(() -> deviceService.startHeating((String) cmdForm.getParams().get("heaterId"),(Double) cmdForm.getParams().get("temperature")));
         return run(cmdList);
     }
 // 摇匀