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

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

2019-01-08 f6bfafc3a6cd50f11fbf498ecf21498bd9112ff4

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

                    }

                 }

              }