Merge branch 'dev_ztns' into dev_ywx_ztns

zouyu

昨天 6fb742d463ecac5e7d4934d7248a40979edc3626

 basic-server/src/main/java/com/ruoyi/basic/pojo/StructureItemParameter.java

@@ -120,5 +120,8 @@
    @ApiModelProperty(value = "设备id")
    private String deviceIds;

    @ApiModelProperty(value = "抽检类型, 1:月度, 2:季度, 3:年度")
    private String spotCheckType;

}