From 85e313a22211cfcc845d0feb5c9ccb274242e4a4 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Thu, 9 Oct 2025 14:30:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/data/entity/data/DataEmployeeLocationEntity.java | 3 +++ .../modules/data/service/data/impl/BusDataServiceImpl.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/main/java/com/zcloud/modules/data/entity/data/DataEmployeeLocationEntity.java b/src/main/java/com/zcloud/modules/data/entity/data/DataEmployeeLocationEntity.java index d2a7f8b..ab97a44 100644 --- a/src/main/java/com/zcloud/modules/data/entity/data/DataEmployeeLocationEntity.java +++ b/src/main/java/com/zcloud/modules/data/entity/data/DataEmployeeLocationEntity.java @@ -1,6 +1,8 @@ package com.zcloud.modules.data.entity.data; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import io.swagger.annotations.ApiModelProperty; @@ -20,6 +22,7 @@ import java.util.Date; public class DataEmployeeLocationEntity extends Model { @ApiModelProperty(value = "主键") + @TableId(type = IdType.ASSIGN_ID) private Long id; @ApiModelProperty(value = "业务数据id") diff --git a/src/main/java/com/zcloud/modules/data/service/data/impl/BusDataServiceImpl.java b/src/main/java/com/zcloud/modules/data/service/data/impl/BusDataServiceImpl.java index 079dfd7..69160e2 100644 --- a/src/main/java/com/zcloud/modules/data/service/data/impl/BusDataServiceImpl.java +++ b/src/main/java/com/zcloud/modules/data/service/data/impl/BusDataServiceImpl.java @@ -386,6 +386,9 @@ public class BusDataServiceImpl implements BusDataService { }); } + result.forEach(dto -> { + dto.put("id",dto.get("id")+""); + }); return new PageUtils(result, total, req.getLimit(), req.getCurPage()); }