Merge remote-tracking branch 'origin/master'

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnvWarningThresholdController.java

@@ -68,6 +68,8 @@ public class EnvWarningThresholdController {
             envWarningThreshold1.setMinTem((double) 0);
             envWarningThreshold1.setMaxHum((double) 0);
             envWarningThreshold1.setMinHum((double) 0);
+            envWarningThreshold1.setMaxPh((double) 0);
+            envWarningThreshold1.setMinPh((double) 0);
             return new Result(ResultCode.SUCCESS,envWarningThreshold1);
         }else {
             return new Result(ResultCode.SUCCESS,envWarningThreshold);