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

didiyu

2019-01-05 4f39b4da8aae5c905cb35f32a2112db2c488e07f

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

@@ -4487,7 +4487,7 @@
      }*/

      return list;

   }



    
   public static void main(String[] args) throws ParseException {

      //new BattInfImpl().searchAll();