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/TSysAppUserMapper.xml |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/TSysAppUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TSysAppUserMapper.xml
index 7d02f3c..5c3c9f3 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TSysAppUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TSysAppUserMapper.xml
@@ -10,6 +10,7 @@
         <result column="birth_time" property="birthTime" />
         <result column="sex" property="sex" />
         <result column="open_id" property="openId" />
+        <result column="office_open_id" property="officeOpenId" />
         <result column="chronic_disease_id" property="chronicDiseaseId" />
         <result column="status" property="status" />
         <result column="last_reminder_time" property="lastReminderTime" />
@@ -22,10 +23,10 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, nick_name, phone, birth_time, sex, open_id,chronic_disease_id,status,last_reminder_time, create_time, update_time, create_by, update_by, disabled
+        id, nick_name, phone, birth_time, sex, open_id,chronic_disease_id,status,last_reminder_time,office_open_id, create_time, update_time, create_by, update_by, disabled
     </sql>
     <select id="pageList" resultType="com.ruoyi.system.vo.TSysAppUserVO">
-        select tsau.id, tsau.nick_name, tsau.phone, tsau.birth_time, tsau.sex, tsau.open_id,
+        select tsau.id, tsau.nick_name, tsau.phone, tsau.birth_time, tsau.sex, tsau.open_id,tsau.office_open_id,
                tsau.chronic_disease_id,tsau.status,tsau.last_reminder_time, tsau.create_time, tsau.update_time, tsau.create_by,
                tsau.update_by, tsau.disabled, tsi.lastInspectionTime
         from t_sys_app_user tsau
@@ -54,7 +55,7 @@
         ORDER BY tsau.create_time DESC
     </select>
     <select id="pageChronicDiseaseUserList" resultType="com.ruoyi.system.vo.TSysAppUserVO">
-        select tsau.id, tsau.nick_name, tsau.phone, tsau.birth_time, tsau.sex, tsau.open_id,
+        select tsau.id, tsau.nick_name, tsau.phone, tsau.birth_time, tsau.sex, tsau.open_id,tsau.office_open_id,
                tsau.chronic_disease_id,tsau.status,tsau.last_reminder_time, tsau.create_time, tsau.update_time, tsau.create_by,
                tsau.update_by, tsau.disabled
         from t_sys_app_user tsau

--
Gitblit v1.7.1