分支合并冲突解决

chenrui

2025-03-13 f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e

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