~jiangyouyao/beauty-erp.git

			@@ -14,11 +14,15 @@
			c.cumulative_day cumulativeDay,
			c.award_type awardType,
			c.award_name awardName,
			c.coupon_name couponName,
			c.score_cnt scoreCnt,
			d.act_type actType,
			c.award_rule awardRule
			FROM
			activity_sign_receive_record a
			LEFT JOIN biz_user b ON a.user_id = b.user_id
			LEFT JOIN sys_vip_info b ON a.user_id = b.id
			LEFT JOIN activity_sign_award_set c ON a.award_id = c.id
			LEFT JOIN shop_activities d ON a.award_id = d.id
			<where>
			a.company_id = #{record.companyId}
			and a.activity_id = #{record.actId}
			@@ -118,6 +122,9 @@
			SELECT
			a.id id,
			a.state state,
			a.consignee_phone consigneePhone,
			a.consignee_address consigneeAddress,
			a.consignee,
			a.receive_time receiveTime,
			a.write_off_code writeOffCode,
			1 total,
			@@ -128,6 +135,7 @@
			b.prize_start_time prizeStartTime,
			b.award_way awardWay,
			b.introduce_img introduceImg,
			b.customer_phone customerPhone,
			b.award_name awardName
			FROM
			activity_sign_receive_record a