|  | @@ -12,8 +12,8 @@
 | 
											
												
													
														|  |  	</resultMap>
 |  |  	</resultMap>
 | 
											
												
													
														|  |  	
 |  |  	
 | 
											
												
													
														|  |  	<resultMap id="BaseResultMapExt" type="com.ym.mec.biz.dal.entity.LuckDrawLog" extends="BaseResultMap">
 |  |  	<resultMap id="BaseResultMapExt" type="com.ym.mec.biz.dal.entity.LuckDrawLog" extends="BaseResultMap">
 | 
											
												
													
														|  | -		<result column="nickname_" property="user.nickname" jdbcType="VARCHAR" />
 |  | 
 | 
											
												
													
														|  | -		<result column="mobile_no_" property="user.mobileNo" jdbcType="VARCHAR" />
 |  | 
 | 
											
												
													
														|  | 
 |  | +		<result column="username_" property="user.username" jdbcType="VARCHAR" />
 | 
											
												
													
														|  | 
 |  | +		<result column="phone_" property="user.phone" jdbcType="VARCHAR" />
 | 
											
												
													
														|  |  	</resultMap>
 |  |  	</resultMap>
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  	<sql id="Base_Column_List">
 |  |  	<sql id="Base_Column_List">
 | 
											
										
											
												
													
														|  | @@ -98,7 +98,7 @@
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  	<select id="queryPage" parameterType="map" resultMap="BaseResultMapExt">
 |  |  	<select id="queryPage" parameterType="map" resultMap="BaseResultMapExt">
 | 
											
												
													
														|  |  		select
 |  |  		select
 | 
											
												
													
														|  | -		<include refid="Base_Column_List" />,nickname_,mobile_no_
 |  | 
 | 
											
												
													
														|  | 
 |  | +		<include refid="Base_Column_List" />,u.username_,u.phone_
 | 
											
												
													
														|  |  		from (luck_draw_log l left join luck_draw_prize d on
 |  |  		from (luck_draw_log l left join luck_draw_prize d on
 | 
											
												
													
														|  |  		l.prize_id_ = d.id_) left join sys_user u on u.id_=l.user_id_
 |  |  		l.prize_id_ = d.id_) left join sys_user u on u.id_=l.user_id_
 | 
											
												
													
														|  |  		<include refid="queryCondition" />
 |  |  		<include refid="queryCondition" />
 |