From 857d738b56e4801a07521cfde502bd5c0f2bf132 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 29 十二月 2023 11:41:02 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeHistoryMapper.xml |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeHistoryMapper.xml
index b9424b3..45d08e3 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeHistoryMapper.xml
@@ -5,8 +5,8 @@
     <!--@mbg.generated-->
     <!--@Table se_recharge_history-->
     <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="cardNum" jdbcType="VARCHAR" property="cardnum" />
-    <result column="clientNum" jdbcType="VARCHAR" property="clientnum" />
+    <result column="cardId" jdbcType="BIGINT" property="cardid" />
+    <result column="clientId" jdbcType="BIGINT" property="clientid" />
     <result column="money" jdbcType="FLOAT" property="money" />
     <result column="amount" jdbcType="FLOAT" property="amount" />
     <result column="gift" jdbcType="FLOAT" property="gift" />
@@ -19,7 +19,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, cardNum, clientNum, money, amount, gift, afterRecharge, paymentId, price, remarks, 
+    id, cardId, clientId, money, amount, gift, afterRecharge, paymentId, price, remarks, 
     `operator`, operateDt
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -37,11 +37,11 @@
 
   <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeRechargeHistory">
     <!--@mbg.generated-->
-    insert into se_recharge_history (id, cardNum, clientNum, money,
+    insert into se_recharge_history (id, cardId, clientId, money,
       amount, gift, afterRecharge, 
       paymentId, price, remarks, 
       `operator`, operateDt)
-    values (#{id,jdbcType=BIGINT}, #{cardnum,jdbcType=VARCHAR}, #{clientnum,jdbcType=VARCHAR}, #{money,jdbcType=FLOAT},
+    values (#{id,jdbcType=BIGINT}, #{cardid,jdbcType=BIGINT}, #{clientid,jdbcType=BIGINT}, #{money,jdbcType=FLOAT},
       #{amount,jdbcType=FLOAT}, #{gift,jdbcType=FLOAT}, #{afterrecharge,jdbcType=FLOAT}, 
       #{paymentid,jdbcType=BIGINT}, #{price,jdbcType=FLOAT}, #{remarks,jdbcType=VARCHAR}, 
       #{operator,jdbcType=BIGINT}, #{operatedt,jdbcType=TIMESTAMP})
@@ -51,11 +51,11 @@
     <!--@mbg.generated-->
     insert into se_recharge_history
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="cardnum != null">
-        cardNum,
+      <if test="cardid != null">
+        cardId,
       </if>
-      <if test="clientnum != null">
-        clientNum,
+      <if test="clientid != null">
+        clientId,
       </if>
       <if test="money != null">
         money,
@@ -86,11 +86,11 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="cardnum != null">
-        #{cardnum,jdbcType=VARCHAR},
+      <if test="cardid != null">
+        #{cardid,jdbcType=BIGINT},
       </if>
-      <if test="clientnum != null">
-        #{clientnum,jdbcType=VARCHAR},
+      <if test="clientid != null">
+        #{clientid,jdbcType=BIGINT},
       </if>
       <if test="money != null">
         #{money,jdbcType=FLOAT},
@@ -125,11 +125,11 @@
     <!--@mbg.generated-->
     update se_recharge_history
     <set>
-      <if test="cardnum != null">
-        cardNum = #{cardnum,jdbcType=VARCHAR},
+      <if test="cardid != null">
+        cardId = #{cardid,jdbcType=BIGINT},
       </if>
-      <if test="clientnum != null">
-        clientNum = #{clientnum,jdbcType=VARCHAR},
+      <if test="clientid != null">
+        clientId = #{clientid,jdbcType=BIGINT},
       </if>
       <if test="money != null">
         money = #{money,jdbcType=FLOAT},
@@ -164,8 +164,8 @@
   <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoSe.SeRechargeHistory">
     <!--@mbg.generated-->
     update se_recharge_history
-    set cardNum = #{cardnum,jdbcType=VARCHAR},
-      clientNum = #{clientnum,jdbcType=VARCHAR},
+    set cardId = #{cardid,jdbcType=BIGINT},
+      clientId = #{clientid,jdbcType=BIGINT},
       money = #{money,jdbcType=FLOAT},
       amount = #{amount,jdbcType=FLOAT},
       gift = #{gift,jdbcType=FLOAT},

--
Gitblit v1.8.0