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

lxp

2025-03-13 b7c4edd36912d26aa2e8e6fa5605c370bb2e478a

 basic-server/src/main/java/com/ruoyi/basic/service/ProductService.java

@@ -25,4 +25,6 @@
    int delProduct(Integer id);

    void importPartExcel(List<StructureTestObjectData> list);

    String getWordQrModel(Integer orderId);
}