Merge branch 'dev' into dev_zj

zss

2025-03-11 eeb8d7faa8d25b3ca9fe75ef28f035c49af5b06d

 basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java

@@ -178,4 +178,9 @@
            }
        });
    }

    @Override
    public String getWordQrModel(Integer orderId) {
        return baseMapper.getWordQrModel(orderId);
    }
}