Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev...

hdw

2019-01-14 c4901764c4a7b6babf3110c9df7429ab55f870e0

 gx_tieta/src/com/fgkj/services/Deverror_recordService.java

@@ -28,6 +28,18 @@
      }

      return model;

   }

    //用户处理的结果

   public ServiceModel update(Object obj){

      boolean bl=dao.update(obj);

      if (bl) {

         model.setCode(1);

         model.setMsg("修改成功!");

      } else {

         model.setCode(0);

         model.setMsg("修改失败!");

      }

      return model;

   }

   //根据stationid查询设备的问题记录

   public ServiceModel serchByCondition(Object obj){

      List list=dao.serchByCondition(obj);