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

Administrator

2018-11-23 64f1199ba78e7c8e808f735290b5486398b4e447

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

 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;

    }