From f16ec51787ed0cb094b71ff8146c740d944f729d Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 15 五月 2025 11:40:54 +0800
Subject: [PATCH] Merge branch 'dev_platePlanv2' into dev

---
 aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsBomHeaderMapper.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsBomHeaderMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsBomHeaderMapper.java
index a4708dd..f88f938 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsBomHeaderMapper.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsBomHeaderMapper.java
@@ -1,6 +1,6 @@
 package com.aps.core.mapper;
 
-import com.alibaba.fastjson2.JSONObject;
+import com.aps.core.domain.ApsBom;
 import com.aps.core.domain.ApsBomHeader;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -70,5 +70,5 @@
      * @param orgCode BOM Header 鏁版嵁绠＄悊
      * @return BOM Header 鏁版嵁绠＄悊闆嗗悎
      */
-    List<JSONObject> selectBomRedisData(String orgCode);
+    List<ApsBom> selectBomRedisData(String orgCode);
 }

--
Gitblit v1.9.3