Merge remote-tracking branch 'origin/dev' into dev

zhanghl

2025-05-09 32d1bd8a3f94c67198e397aff76bc7b33a30a6b6

 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsBomServiceImpl.java

@@ -115,8 +115,7 @@
            ApsBom build = new  ApsBom();
            build.setBomHeaderId(apsBomHeader.getBomHeaderId());
            build.setOrgCode(apsBomHeader.getOrgCode());
            List<ApsBom> apsBoms = apsBomMapper.selectApsBomList(build);
            return apsBoms;
            bomLineList = apsBomMapper.selectApsBomList(build);
        }
        return bomLineList;
    }