Merge branch 'dev' into 'master'

src/main/java/com/shadow/iot/entity/DeviceInfoPO.java

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author baomidou
- * @since 2019-03-27
+ * @since 2019-05-29
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -29,21 +29,9 @@ public class DeviceInfoPO implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    /**
-     * 设备编号(出厂编号)
-     */
-    @TableField("product_code")
-    private String productCode;
-
     @TableField("device_id")
     private String deviceId;
 
-    /**
-     * 设备名称
-     */
-    @TableField("name")
-    private String name;
-
     /**
      * 0离线，1在线
      */
@@ -75,22 +63,10 @@ public class DeviceInfoPO implements Serializable {
     private Integer isUsed;
 
     /**
-     * 机械框架代码
-     */
-    @TableField("frame_code")
-    private String frameCode;
-
-    /**
-     * 设备描述
+     * 是否正在使用：0未锁定；1锁定
      */
-    @TableField("descreption")
-    private String descreption;
-
-    /**
-     * 设备调试完成开始运营时间
-     */
-    @TableField("business_time")
-    private LocalDateTime businessTime;
+    @TableField("locked")
+    private Integer locked;
 
     /**
      * 创建时间
@@ -98,6 +74,9 @@ public class DeviceInfoPO implements Serializable {
     @TableField("create_time")
     private LocalDateTime createTime;
 
+    /**
+     * 更新时间
+     */
     @TableField("update_time")
     private LocalDateTime updateTime;