From e6dcae2021b656ce5672674221d4a3d241a0ebcc Mon Sep 17 00:00:00 2001
From: panshuling321 <panshuling321@163.com>
Date: Sun, 24 Apr 2022 21:29:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=98=E6=89=A3=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=9A=84=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/domain/XhpcActivityDiscountDomain.java    |  4 ++--
 .../resources/mapper/XhpcActivityDiscountMapper.xml    | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityDiscountDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityDiscountDomain.java
index ddb5d796..c2cccd6a 100644
--- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityDiscountDomain.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcActivityDiscountDomain.java
@@ -65,12 +65,12 @@ public class XhpcActivityDiscountDomain implements Serializable {
     /**
      * 状态（0-编辑，1-提交待审核，2-审核失败，3-审核通过，4-立即失效）
      */
-    private Integer status = 1;
+    private Short status = 1;
 
     /**
      * 删除标识（0-正常，2-删除）
      */
-    private Integer delFlag = 0;
+    private Short delFlag = 0;
 
     /**
      * 创建人
diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityDiscountMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityDiscountMapper.xml
index 02c3cd1e..cd3e0a2d 100644
--- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityDiscountMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityDiscountMapper.xml
@@ -12,8 +12,8 @@
         <result column="tenant_id" jdbcType="VARCHAR" property="tenantId"/>
         <result column="start_time" jdbcType="TIMESTAMP" property="startTime"/>
         <result column="end_time" jdbcType="TIMESTAMP" property="endTime"/>
-        <result column="status" jdbcType="INTEGER" property="status"/>
-        <result column="del_flag" jdbcType="INTEGER" property="delFlag"/>
+        <result column="status" jdbcType="SMALLINT" property="status"/>
+        <result column="del_flag" jdbcType="SMALLINT" property="delFlag"/>
         <result column="create_by" jdbcType="VARCHAR" property="createBy"/>
         <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
         <result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
@@ -91,7 +91,7 @@
                                             check_by, check_time)
         values (#{activityName, jdbcType=VARCHAR}, #{templateId, jdbcType=INTEGER}, #{appUserList,jdbcType=VARCHAR},
                 #{comUserList,jdbcType=VARCHAR}, #{cusUserList,jdbcType=VARCHAR},
-                #{stationList,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{status,jdbcType=SMALLINT},
+                #{stationList,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{status},
                 #{startTime, jdbcType=TIMESTAMP}, #{endTime, jdbcType=TIMESTAMP},
                 0, #{createBy,jdbcType=VARCHAR}, sysdate(),
                 #{updateBy,jdbcType=VARCHAR}, sysdate(), null, null)
@@ -115,7 +115,7 @@
 
     <update id="checkByPrimaryKey" parameterType="com.xhpc.activity.domain.XhpcActivityDiscountDomain">
         update xhpc_activity_discount
-        set `status`   = #{status,jdbcType=SMALLINT},
+        set `status`   = #{status},
             check_by   = #{checkBy,jdbcType=VARCHAR},
             check_time = sysdate()
         where activity_id = #{activityId,jdbcType=INTEGER}
@@ -124,7 +124,7 @@
 
     <update id="updateStatusByPrimaryKey" parameterType="com.xhpc.activity.domain.XhpcActivityCashDomain">
         update xhpc_activity_discount
-        set `status`    = #{status,jdbcType=SMALLINT},
+        set `status`    = #{status},
             update_by   = #{updateBy,jdbcType=VARCHAR},
             update_time = sysdate()
         where activity_id = #{activityId,jdbcType=INTEGER}