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

didiyu

2018-12-10 6382c2a4220ff5774dba39848c2faabf0f7002f1

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