Merge branch 'master' of http://gitlab.scsmile.cn/zxf/sample-form-platform

common-lib/src/main/java/com/mortals/xhx/common/pdu/device/DevicePdu.java

@@ -86,6 +86,11 @@ public class DevicePdu extends BaseEntityLong {
     */
     private Integer source;
 
+    /**
+     * 启用状态 (0.停止，1.启用)
+     */
+    private Integer enabled;
+
 public void initAttrValue(){
 
             this.deviceId = null;

sample-form-manager/src/main/java/com/mortals/xhx/daemon/task/SyncSiteDeviceTaskImpl.java

@@ -137,7 +137,7 @@ public class SyncSiteDeviceTaskImpl implements ITaskExcuteService {
 
                         if (!ObjectUtils.isEmpty(updateDeviceLsit)) {
                             log.info("设备更新，size:{}", updateDeviceLsit.size());
-                            // deviceService.update(updateDeviceLsit);
+                             deviceService.update(updateDeviceLsit);
                         }
 
                         if (!ObjectUtils.isEmpty(saveDeviceList)) {