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

zhanghl

2025-05-23 97ee5904ad00373cd60e1e12d26bad6b5cdb6b66

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

@@ -139,10 +139,7 @@
                ApsBom apsBom = jsonArray.getJSONObject(i).to(ApsBom.class);
                bomLineList.add(apsBom);
            }
        }else {
            bomLineList = selectApsBomLineList(plant, itemNumber);
        }

        return bomLineList;
    }
}