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

zss

2025-03-13 3b92cf3f9cd038c446e390aab18e759b0463d24a

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