Merge branch 'dev' of http://192.168.1.220:10080/jiwei/jw2.0 into dev

Conflicts:
	svr/svr-iot/src/main/resources/application.yml

common/common-rest-model/pom.xml

@@ -61,10 +61,5 @@
            <artifactId>jest-common</artifactId>
            <version>2.4.0</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.base</groupId>
            <artifactId>common-data-es</artifactId>
            <version>1.0.0</version>
        </dependency>
    </dependencies>
</project>

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/iot/common/SaveModel.java

@@ -0,0 +1,23 @@
package com.yihu.jw.restmodel.iot.common;
import io.searchbox.annotations.JestId;
/**
 * @author yeshijie on 2018/3/2.
 */
public class SaveModel {
    @JestId
    private String id;
    public SaveModel() {
    }
    public String getId() {
        return this.id;
    }
    public void setId(String id) {
        this.id = id;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/iot/device/LocationDataVO.java

@@ -1,7 +1,7 @@
package com.yihu.jw.restmodel.iot.device;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.yihu.base.es.config.model.SaveModel;
import com.yihu.jw.restmodel.iot.common.SaveModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.data.elasticsearch.core.geo.GeoPoint;