Merge branch 'dev' of chinawu123/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/device/YsDeviceService.java

@@ -234,7 +234,7 @@ public class YsDeviceService {
        }
        param.add("deviceSerial",deviceSerial);
        param.add("channelNo",channelNo+"");
        param.add("expireTime","86400");//过期时间一天
        //param.add("expireTime","86400");//过期时间一天
        HttpEntity<JSONObject> response = httpClientUtil.iotAssesTokenPostHttp(YsConfig.getDeviceLiveAddress,param,HttpMethod.POST);
        JSONObject responseBody = response.getBody();
        if (responseBody.getInteger("code")==200){