From 3d3284f5ba3eff6f92228e0703a4f5ace4cbf343 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期一, 15 十二月 2025 11:35:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/resources/mapper/system/TIntegralSettlementMapper.xml |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/TIntegralSettlementMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TIntegralSettlementMapper.xml
index e62f215..40d7a76 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TIntegralSettlementMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TIntegralSettlementMapper.xml
@@ -12,11 +12,13 @@
         <result column="total_settlement_integral" property="totalSettlementIntegral" />
         <result column="create_time" property="createTime" />
         <result column="create_user_id" property="createUserId" />
+        <result column="type" property="type" />
+        <result column="buy_user_id" property="buyUserId" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, app_user_id, settlement_interval, settlement_start_time, settlement_end_time, total_settlement_integral, create_time, create_user_id
+        id, app_user_id, settlement_interval, settlement_start_time, settlement_end_time, total_settlement_integral, create_time, create_user_id,`type`,buy_user_id
     </sql>
 
 </mapper>

--
Gitblit v1.7.1