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

hdw

2018-12-06 e05dce3c6df04e37866bd7b5f5d2e6a93e1a4999

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

@@ -39,7 +39,7 @@
    * @return

    */

   public String findhistory_ky(){

      isAllowHeaders();

      //isAllowHeaders();

      ServiceModel model = new ServiceModel();

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

      model = service.serchByCondition_ky(btd);