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

D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore

2019-01-18 864e4772eea5e0a589b6f6797d0695a3b3dd225e

 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());