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

zhanghl

2025-05-13 088c51472985d0325141ca8ffd406d2e8b25a5d3

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

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

        return bomLineList;
    }