From f0da95925bcb8ad19b0d1cc78afe4b4a4ae188a6 Mon Sep 17 00:00:00 2001
From: p-honggang.li <p-honggang.li@pcitc.com>
Date: 星期四, 28 八月 2025 09:55:51 +0800
Subject: [PATCH] Merge branch 'master' of http://xearth.cn:6600/r/web-manage/web-manage-back
---
src/main/resources/mapper/ProductPricingMapper.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/ProductPricingMapper.xml b/src/main/resources/mapper/ProductPricingMapper.xml
index 1d5398f..fb76f20 100644
--- a/src/main/resources/mapper/ProductPricingMapper.xml
+++ b/src/main/resources/mapper/ProductPricingMapper.xml
@@ -15,9 +15,9 @@
<result column="points_price" property="pointsPrice" jdbcType="DECIMAL"/>
<result column="currency_price" property="currencyPrice" jdbcType="DECIMAL"/>
<result column="is_active" property="isActive" jdbcType="BOOLEAN"/>
- <result column="product_id" property="productId" jdbcType="BIGINT"/>
+ <result column="product_id" property="productId" jdbcType="VARCHAR"/>
<result column="product_name" property="productName" jdbcType="VARCHAR"/>
- <result column="provider_id" property="providerId" jdbcType="BIGINT"/>
+ <result column="provider_id" property="providerId" jdbcType="VARCHAR"/>
<result column="provider_name" property="providerName" jdbcType="VARCHAR"/>
<result column="description" property="description" jdbcType="VARCHAR"/>
<result column="created_at" property="createdAt" jdbcType="TIMESTAMP"/>
@@ -38,7 +38,7 @@
<select id="selectProductPricingPage" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List"/>
- FROM product_pricing
+ FROM tb_product_pricing
WHERE deleted = 0
<if test="productId != null">
AND product_id = #{productId}
@@ -50,7 +50,7 @@
<select id="selectByProductId" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List"/>
- FROM product_pricing
+ FROM tb_product_pricing
WHERE deleted = 0 AND product_id = #{productId}
ORDER BY created_at DESC
</select>
@@ -59,7 +59,7 @@
<select id="selectByCondition" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List"/>
- FROM product_pricing
+ FROM tb_product_pricing
WHERE deleted = 0
<if test="suiteName != null and suiteName != ''">
AND suite_name LIKE CONCAT('%', #{suiteName}, '%')
--
Gitblit v1.8.0