From 64027e45c5b0d9dfe1a5536f30ca9183af24b456 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 13 一月 2026 11:01:06 +0800
Subject: [PATCH] Merge branch 'jtwy' into dev_New
---
src/main/resources/mapper/basic/ProductModelMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index a3214d0..e4e665c 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -15,7 +15,7 @@
<result column="product_id" property="productId" />
</resultMap>
<select id="listPageProductModel" resultType="com.ruoyi.basic.pojo.ProductModel">
- select pm.*,p.product_name,
+ select pm.*,p.product_name
from product_model pm
left join product p on pm.product_id = p.id
<where>
--
Gitblit v1.9.3