From b919b454bccc18d67b7109a09357499d09211eac Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Thu, 17 Jul 2025 18:07:08 +0800
Subject: [PATCH] Merge branch 'xin' into pxb
---
oying-system/src/main/resources/mapper/pc/product/ProductMapper.xml | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/oying-system/src/main/resources/mapper/pc/product/ProductMapper.xml b/oying-system/src/main/resources/mapper/pc/product/ProductMapper.xml
index 43a18b8..209639f 100644
--- a/oying-system/src/main/resources/mapper/pc/product/ProductMapper.xml
+++ b/oying-system/src/main/resources/mapper/pc/product/ProductMapper.xml
@@ -11,8 +11,8 @@
<result column="category_id" property="categoryId"/>
<result column="second_category_id" property="secondCategoryId"/>
<result column="status" property="status"/>
- <result column="main_image" property="mainImage"/>
- <result column="detail_image" property="detailImage"/>
+ <result column="main_image_id" property="mainImageId"/>
+ <result column="main_image_Url" property="mainImageUrl"/>
<result column="description" property="description"/>
<result column="price" property="price"/>
<result column="stock_quantity" property="stockQuantity"/>
@@ -22,12 +22,18 @@
<result column="width" property="width"/>
<result column="length" property="length"/>
<result column="height" property="height"/>
+ <result column="returns" property="returns"/>
+ <result column="self_pickup" property="selfPickup"/>
<result column="deleted_flag" property="deletedFlag"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
<result column="version" property="version"/>
</resultMap>
<sql id="Base_Column_List">
- product_id, store_id, code, barcode, name, title, category_id, second_category_id, status, main_image, detail_image, description, price, stock_quantity, min_purchase_quantity, warn_stock, weight, width, length, height, deleted_flag, create_by, create_time, update_by, update_time, version
+ product_id, store_id, code, barcode, name, title, category_id, second_category_id, status, main_image_id, main_image_url, description, price, stock_quantity, min_purchase_quantity, warn_stock, weight, width, length, height, returns, self_pickup, deleted_flag, create_by, create_time, update_by, update_time, version
</sql>
<select id="findAll" resultMap="BaseResultMap">
@@ -55,6 +61,9 @@
</if>
</where>
order by product_id desc
+ <if test="criteria.limit != null">
+ limit #{criteria.limit}
+ </if>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3