Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git ...

Administrator

2018-12-25 d7049dae792f0a6d2ee4246acf4b42bf0b36635c

 gx_tieta/src/com/fgkj/dao/impl/Deverror_recordImpl.java

@@ -27,7 +27,7 @@
   public boolean add(Object obj) {

      Deverror_record dev_record=(Deverror_record) obj;

      String sql=" insert into db_battinf.tb_deverror_record(stationId,record_time,error_descript,error_dispose,uid,uname,picture_num,error_state ";

      String endsql=") values(?,?,?,?,?,?,?";

      String endsql=") values(?,?,?,?,?,?,?,?";

      List list=new ArrayList();

      list.add(dev_record.getStationId());

      list.add(dev_record.getRecord_time());