From 2ed572d6b2a4be6b91b3e2a1ed48485abde91553 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 15 Jul 2024 10:54:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zyqs-0502' into rb-copy

---
 src/main/resources/mapper/StockDzMapper.xml |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/StockDzMapper.xml b/src/main/resources/mapper/StockDzMapper.xml
index 6ccbb17..353599a 100644
--- a/src/main/resources/mapper/StockDzMapper.xml
+++ b/src/main/resources/mapper/StockDzMapper.xml
@@ -10,7 +10,7 @@
             <result property="stockCode" column="stock_code" jdbcType="VARCHAR"/>
             <result property="stockType" column="stock_type" jdbcType="VARCHAR"/>
             <result property="stockGid" column="stock_gid" jdbcType="VARCHAR"/>
-            <result property="stockPlate" column="stock_plate" jdbcType="VARCHAR"/>
+            <result property="stockSpell" column="stock_spell" jdbcType="VARCHAR"/>
             <result property="isLock" column="is_lock" jdbcType="INTEGER"/>
             <result property="isShow" column="is_show" jdbcType="INTEGER"/>
             <result property="addTime" column="add_time" jdbcType="TIMESTAMP"/>
@@ -25,7 +25,7 @@
 
     <sql id="Base_Column_List">
         id,stock_name,stock_code,
-        stock_type,stock_gid,stock_plate,
+        stock_type,stock_gid,stock_spell,
         is_lock,is_show,add_time,
         spread_rate,increase_ratio,stock_num,
         password,start_time,end_time,discount
@@ -42,4 +42,8 @@
         </where>
         ORDER BY id ASC
     </select>
+
+    <select id="getPrice" parameterType="string" resultType="decimal">
+        select price from stock_setting where stock_code=#{stockCode}
+    </select>
 </mapper>

--
Gitblit v1.9.3