Merge branch 'cherry-pick-f10c5ce4' into 'master'

fix: 设备entity缺少ota字段

See merge request yunteng/thingskit!488

@@ -55,7 +55,8 @@ public class TkDeviceEntity extends TbTenantBaseEntity {
 
   /** 告警状态：0：正常 1：告警 */
   private Integer alarmStatus;
-
+  private String firmwareId;
+  private String softwareId;
 
   @TableField(exist = false)
   private String customerName;