From 0526acc407572d23b1030e0ffd842406ae0bc121 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 16 Jul 2025 18:20:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pxb' into xin
---
oying-system/src/main/resources/mapper/pc/store/StoreQualificationMapper.xml | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/oying-system/src/main/resources/mapper/pc/store/StoreQualificationMapper.xml b/oying-system/src/main/resources/mapper/pc/store/StoreQualificationMapper.xml
index 76b3c9c..96ddca6 100644
--- a/oying-system/src/main/resources/mapper/pc/store/StoreQualificationMapper.xml
+++ b/oying-system/src/main/resources/mapper/pc/store/StoreQualificationMapper.xml
@@ -8,6 +8,7 @@
<result column="qualification_number" property="qualificationNumber"/>
<result column="qualification_name" property="qualificationName"/>
<result column="qualification_image_id" property="qualificationImageId"/>
+ <result column="qualification_image_url" property="qualificationImageUrl"/>
<result column="start_date" property="startDate"/>
<result column="end_date" property="endDate"/>
<result column="status" property="status"/>
@@ -18,8 +19,8 @@
</resultMap>
<sql id="Base_Column_List">
- qualification_id, store_id, qualification_type, qualification_number, qualification_name, qualification_image_id, start_date, end_date, status,
- create_by, create_time, update_by, update_time
+ qualification_id, store_id, qualification_type, qualification_number, qualification_name, qualification_image_id, qualification_image_url,
+ start_date, end_date, status, create_by, create_time, update_by, update_time
</sql>
<select id="findAll" resultMap="BaseResultMap">
@@ -27,6 +28,9 @@
<include refid="Base_Column_List"/>
from pc_store_qualification
<where>
+ <if test="criteria.qualificationId != null">
+ and qualification_id = #{criteria.qualificationId}
+ </if>
<if test="criteria.storeId != null">
and store_id = #{criteria.storeId}
</if>
--
Gitblit v1.9.3