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

hdw

2018-12-14 b57421be61dc67812ec97b169fbe2c193319d510

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

@@ -39,11 +39,11 @@
    * @return

    */

   public String findhistory_ky(){

      isAllowHeaders();

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

   }