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

chenrui

2025-03-11 b9f91c347781ba8fffd778165415c517332b4313

 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);
}