fix: 设备相关接口

1.修复设备配置数据丢失问题
2.修复tb设备id丢失问题

@@ -45,7 +45,7 @@ public class DeviceDTO extends TenantDTO {
   @ApiModelProperty(value = "设备唯一编号", required = true)
   private String deviceToken;
   // 不用序列化给前端
-  @JsonIgnore private String tbDeviceId;
+  private String tbDeviceId;
   private String deviceTypeId;
 
   @NotEmpty(

@@ -38,7 +38,7 @@
         SELECT
         <include refid="columns"/>,ifdp.name AS profile_name,io.name AS organization_name
         FROM iotfs_device ifd
-        LEFT JOIN iotfs_device_profile ifdp ON ifd.profile_id = ifdp.id
+        LEFT JOIN device_profile ifdp ON ifd.profile_id = CAST (ifdp.id AS VARCHAR)
         LEFT JOIN iotfs_organization io ON io.id = ifd.organization_id
         <where>
             <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">