Merge branch 'master' into fpg-master

jeecg-module-gather/src/main/java/org/jeecg/modules/fpgJob/entity/FpgLeanModel.java

@@ -115,4 +115,7 @@ public class FpgLeanModel implements Serializable {
     @Dict(dicCode = "electric_current")
     @ApiModelProperty(value = "电流统计 1：开启 2： 关闭")
     private Integer electricCurrent;
+    @Excel(name = "设备ID集合", width = 15)
+    @ApiModelProperty(value = "设备ID集合")
+    private String deviceInformationIds;
 }