Merge remote-tracking branch 'origin/dev_ztns' into dev_ztns

gongchunyi

2 天以前 a1e19c7466cce45b5bb360e38ab7c7c1753986f2

 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;

}