Merge branch 'dev' into dev_zj

zss

2025-03-11 eeb8d7faa8d25b3ca9fe75ef28f035c49af5b06d

 basic-server/src/main/java/com/ruoyi/basic/mapper/ProductMapper.java

@@ -17,6 +17,8 @@
public interface ProductMapper extends BaseMapper<Product> {

    IPage<Product> selectProductListByObjectId(Page page, @Param("ew") QueryWrapper<ProductDTO1> ew, @Param("partNo") String partNo);

    String getWordQrModel(Integer orderId);
}