Merge remote-tracking branch 'origin/master'

shiwan/admin/src/main/java/com/huimv/admin/dto/MachineControlDTO.java

@@ -14,7 +14,7 @@ public class MachineControlDTO {
 
     private Integer id;
 
-    private String jqId;
+    private String jqid;
 
     private String no1DlstartTime1;
 
@@ -56,12 +56,12 @@ public class MachineControlDTO {
         this.id = id;
     }
 
-    public String getJqId() {
-        return jqId;
+    public String getJqid() {
+        return jqid;
     }
 
-    public void setJqId(String jqId) {
-        this.jqId = jqId;
+    public void setJqid(String jqid) {
+        this.jqid = jqid;
     }
 
     public String getNo1DlstartTime1() {

shiwan/admin/src/main/java/com/huimv/admin/service/secondary/impl/MachineControlServiceImpl.java

@@ -60,13 +60,13 @@ public class MachineControlServiceImpl implements MachineControlService {
         machineControlEntity.setNo4DlstartTime4(machineControlDTO.getNo4DlstartTime4());
 
         if (isAdd) {
-            machineControlEntity.setJqId(machineControlDTO.getJqId());
+            machineControlEntity.setJqId(machineControlDTO.getJqid());
             machineControlRepository.saveAndFlush(machineControlEntity);
             return;
         }
 
         machineControlEntity.setId(machineControlDTO.getId());
-        machineControlRepository.saveAndFlush(machineControlEntity);
+        machineControlRepository.save(machineControlEntity);
 
     }