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

# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java

coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml

@@ -25,12 +25,14 @@
     <result column="weakness" jdbcType="VARCHAR" property="weakness" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="detailed_address" jdbcType="VARCHAR" property="detailedAddress" />
+    <result column="email" jdbcType="VARCHAR" property="email" />
   </resultMap>
   <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, 
-    create_time, update_time
+    create_time, update_time,detailed_address,email
   </sql>
   <select id="selectByPrimaryKeySelective" resultMap="BaseResultMap">
     select
@@ -109,6 +111,15 @@
       <if test="record.updateTime != null">
         update_time,
       </if>
+      <if test="record.otherBand != null">
+        other_band,
+      </if>
+      <if test="record.detailedAddress != null">
+        detailed_address,
+      </if>
+      <if test="record.email != null">
+        email,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="record.partnerId != null">
@@ -177,6 +188,12 @@
       <if test="record.updateTime != null">
         #{record.updateTime},
       </if>
+      <if test="record.detailedAddress != null">
+        #{record.detailedAddress},
+      </if>
+      <if test="record.email != null">
+        #{record.email},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective">
@@ -248,6 +265,12 @@
       <if test="record.updateTime != null">
         update_time = #{record.updateTime},
       </if>
+      <if test="record.detailedAddress != null">
+        detailed_address = #{record.detailedAddress},
+      </if>
+      <if test="record.email != null">
+        email = #{record.email},
+      </if>
     </set>
     where id = #{record.id}
   </update>