From d69ee0edbb5df260ac6b872357b88499d7914610 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 30 十二月 2024 09:08:53 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes

---
 manage/src/main/resources/mapping/TLineUpMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manage/src/main/resources/mapping/TLineUpMapper.xml b/manage/src/main/resources/mapping/TLineUpMapper.xml
index 3f2d9ef..11ee095 100644
--- a/manage/src/main/resources/mapping/TLineUpMapper.xml
+++ b/manage/src/main/resources/mapping/TLineUpMapper.xml
@@ -24,7 +24,7 @@
     <select id="pageList" resultType="com.jilongda.manage.model.TLineUp">
         select t.*,u.name,u.phone,u.age,u.gender,u.realName,s.name storeName,o.name optometrist
         from t_line_up t
-        left join t_user u on t.userId = u.id
+        left join t_app_user u on t.userId = u.id
         left join t_optometrist o on t.optometristId = o.id
         left join t_store s on t.storeId = s.id
         <where>
@@ -40,7 +40,7 @@
             <if test="query.storeId != null">
                 and s.id = #{query.storeId}
             </if>
-            and t1.isDelete =  ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
+            and t.isDelete =  ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
 
         </where>
         order by t.createTime desc

--
Gitblit v1.7.1