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

81041

2019-01-15 6fc11b72fa9f3812e91814c935cc06b8d04f2f51

 gx_tieta/src/com/fgkj/services/ram/Fbs9100_battparamService.java

@@ -180,6 +180,8 @@
                    if(b) {

                       success+=1;

                       list.get(i).setNum(1);

                       List listbatt=dao.serchByCondition(fs);

                       list.get(i).setObj(listbatt);

                    }

                 }

              }