From f7410364109ebb426a5e0184683a10fb1efdd0a0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 22 Dec 2021 14:59:27 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-video
---
src/main/resources/mapper/modules/VideoMemberMapper.xml | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/modules/VideoMemberMapper.xml b/src/main/resources/mapper/modules/VideoMemberMapper.xml
index 3cdfc00..fd87314 100644
--- a/src/main/resources/mapper/modules/VideoMemberMapper.xml
+++ b/src/main/resources/mapper/modules/VideoMemberMapper.xml
@@ -14,10 +14,19 @@
select * from video_member where account=#{account} and password=#{password}
</select>
- <select id="selectVideoMemberListInPage" resultType="cc.mrbird.febs.video.entity.VideoMemberEntity">
+ <select id="selectVideoMemberListInPage" resultType="cc.mrbird.febs.video.vo.AdminVideoMemberEntityVo">
SELECT
- a.*
+ a.id id,
+ a.account account,
+ a.name name,
+ a.is_vip isVip,
+ a.account_type accountType,
+ a.account_status accountStatus,
+ a.created_time createdTime,
+ b.buy_time buyTime,
+ b.expire_time expireTime
FROM video_member a
+ left join video_vip_info b on a.id = b.member_id
<where>
<if test="record != null" >
<if test="record.account!=null and record.account!=''">
@@ -35,4 +44,8 @@
order by a.CREATED_TIME desc
</select>
+ <select id="getAppVersionListInPage" resultType="cc.mrbird.febs.video.entity.AppVersion">
+ select a.* from app_version a
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1