Merge branch 'dev' of yeshijie/jw2.0 into dev

common/common-fegin/pom.xml

@@ -33,6 +33,7 @@
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-rest-model-es</artifactId>
            <version>${parent.version}</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>

svr/svr-iot/src/main/java/com/yihu/iot/service/label/FigureLabelSerachService.java

@@ -49,6 +49,7 @@ public class FigureLabelSerachService implements Serializable {
                JSONObject json = new JSONObject();
                field("and","idcard","=",one.getIdCard(),jsonArray);
                field("and","labelType","=","3",jsonArray);
                field("and","dictCode","=","people_category_dict",jsonArray);
                json.put("filter",jsonArray);
                boolean isTNB = false;//是否糖尿病