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

LiJun

2018-11-26 a6b4c1e19b3b3fdcf80d7f69f20fe406205fcf8f

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

@@ -41,9 +41,9 @@
   public String findhistory_ky(){

      isAllowHeaders();

      ServiceModel model = new ServiceModel();

      btd = ActionUtil.getGson().fromJson(json, Batttestdata.class);

      model = service.serchByCondition_ky(btd);

      result = ActionUtil.tojson(model);

      //System.out.println("*************************");

      return SUCCESS;

   }