From 166cd8c27af982c8bd5d7075792dc097e86a7328 Mon Sep 17 00:00:00 2001
From: aikai <ZZL86tdd>
Date: Mon, 31 Mar 2025 16:36:22 +0800
Subject: [PATCH] =?UTF-8?q?refactor(smartfactory):=20=E9=87=8D=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D=E5=AD=97=E6=AE=B5=E5=B9=B6=E4=BC=98=E5=8C=96=E6=98=A0?=
 =?UTF-8?q?=E5=B0=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 LineFixedAssetsMapper 中的 id 列重命名为 assetsId- 移除 LineFixedAssetsMapper 中的冗余 factoryName 列
- 更新 LineFixedAssetsController 中的相关代码
---
 .../admin/linefixedassets/LineFixedAssetsController.java      | 2 +-
 .../mapper/linefixedassets/LineFixedAssetsMapper.xml          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/linefixedassets/LineFixedAssetsController.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/linefixedassets/LineFixedAssetsController.java
index b69fac47..e1703bd7 100644
--- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/linefixedassets/LineFixedAssetsController.java
+++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/controller/admin/linefixedassets/LineFixedAssetsController.java
@@ -92,4 +92,4 @@ public class LineFixedAssetsController {
                         BeanUtils.toBean(list, LineFixedAssetsRespVO.class));
     }
 
-}
\ No newline at end of file
+}
diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/linefixedassets/LineFixedAssetsMapper.xml b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/linefixedassets/LineFixedAssetsMapper.xml
index 2e2e5f38..3ce91af6 100644
--- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/linefixedassets/LineFixedAssetsMapper.xml
+++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/linefixedassets/LineFixedAssetsMapper.xml
@@ -11,11 +11,11 @@
 
     <select id="getLineFixedAssetsPage"
             resultType="cn.iocoder.yudao.module.smartfactory.dal.dataobject.linefixedassets.LineFixedAssetsDO">
-        select a.id,
+        select a.id as assetsId,
         a.assets_no as assetsNo,
         d.id AS factoryId,
         d.name as factoryName,
-        c.id as forkliftId,
+        c.id as id,
         b.dept_id as deptId,
         dept.name as deptName,
         d.name as factoryName,