Merge remote-tracking branch 'origin/dev/feat/partner1.4_20231009' into dev/feat/partner1.4_20231009

This commit is contained in:
俞扬
2023-09-19 16:47:02 +08:00
2 changed files with 3 additions and 2 deletions

View File

@@ -35,7 +35,8 @@
<sql id="Base_Column_List">
id, partner_id, partner_line_id, live_area, want_shop_area, accept_adjust_type, is_have_want_shop,
want_shop_info, max_budget, money_source, money_prove, education, work_year, is_have_work_exp,
work_exp, is_consumer, other_band, brand_strength, need_improve, strength, weakness,detailed_address,email ,acquaintance_flag,acquaintance_name,acquaintance_relationship_type,other_relationship_type
work_exp, is_consumer, other_band, brand_strength, need_improve, strength, weakness,
create_time, update_time,detailed_address,email ,acquaintance_flag,acquaintance_name,acquaintance_relationship_type,other_relationship_type
</sql>
<select id="selectByPrimaryKeySelective" resultMap="BaseResultMap">
select

View File

@@ -356,7 +356,7 @@
hpuinfo.username as partnerUserName,
hpuc.channel_name as channelName,
hpii.education as education,
hpii.detailed_address as detailAddress,
hpii.detailed_address as detailedAddress,
hpii.email as email,
hpl.phone_address as phoneAddress
from hy_partner_line_info a