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

whyclj

2019-01-09 a852102b1b3f30a420b02c0aca96f13d0886af8e

 gx_tieta/src/com/fgkj/actions/BattInfAction.java

@@ -433,9 +433,9 @@
      return SUCCESS;

   }

    //判断新增的机房是否存在

   public String judgeBattInOrNot(){

   public String judgeBatt(){

      BattInf binf=getGson().fromJson(json, BattInf.class);

      ServiceModel model = service.judgeBattInOrNot(binf);

      ServiceModel model = service.judgeBatt(binf);

      result = ActionUtil.tojson(model);

      return SUCCESS;

   }