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

web/src/main/java/com/jpsoft/smart/modules/base/controller/DeviceInfoController.java

@@ -1,6 +1,7 @@
 package com.jpsoft.smart.modules.base.controller;
 
 import com.github.pagehelper.Page;
+import com.jpsoft.smart.modules.base.entity.AlarmInfo;
 import com.jpsoft.smart.modules.common.utils.PojoUtils;
 import com.jpsoft.smart.modules.common.dto.Sort;
 import com.jpsoft.smart.modules.common.dto.MessageResult;
@@ -64,6 +65,19 @@ public class DeviceInfoController {
         return msgResult;
     }
 
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<DeviceInfo> create(){
+        MessageResult<DeviceInfo> msgResult = new MessageResult<>();
+
+        DeviceInfo deviceInfo = new DeviceInfo();
+
+        msgResult.setData(deviceInfo);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+
     @ApiOperation(value="获取设备信息")
     @GetMapping("edit/{id}")
     public MessageResult<DeviceInfo> edit(@PathVariable("id") String id){