Merge branch 'master' of 123.57.213.14:guoqiang.duan/zgzt-sys-java

jeecg-module-gather/src/main/java/org/jeecg/modules/device/entity/DeviceInformation.java

@@ -69,4 +69,11 @@ public class DeviceInformation implements Serializable {
     @Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private String deviceRemark;
+    /**运行状态
+     * RUNNING: '0', STOPPED: '1', ABNORMAL: '2'
+     * */
+    @Excel(name = "运行状态 ", width = 15, dicCode = "sfqy")
+    @ApiModelProperty(value = "运行状态")
+    @Dict(dicCode = "sfqy")
+    private String status;
 }