From 3033ccf3878fae2c204df53be2a283f29f5853ed Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 10 十月 2025 18:17:02 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
---
ruoyi-system/src/main/resources/mapper/system/TSysOtherConfigMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TSysOtherConfigMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TSysOtherConfigMapper.xml
index 7066009..85a2535 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TSysOtherConfigMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TSysOtherConfigMapper.xml
@@ -7,7 +7,7 @@
<id column="id" property="id" />
<result column="procurement_conditions" property="procurementConditions" />
<result column="points_expiration" property="pointsExpiration" />
- <result column="expira_unit" property="expiraUnit" />
+ <result column="expire_unit" property="expireUnit" />
<result column="msg_count" property="msgCount" />
<result column="ai_price" property="aiPrice" />
<result column="delivery_time" property="deliveryTime" />
@@ -21,7 +21,7 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, procurement_conditions, points_expiration, expira_unit, msg_count, ai_price, delivery_time, create_time, update_time, create_by, update_by, disabled, create_id
+ id, procurement_conditions, points_expiration, expire_unit, msg_count, ai_price, delivery_time, create_time, update_time, create_by, update_by, disabled, create_id
</sql>
</mapper>
--
Gitblit v1.7.1