Merge branch 'cc_20230520_partner' of http://gitlab.coolcollege.cn/hangzhou/java/coolstore-partner-manage into cc_20230520_partner

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

@@ -133,6 +133,9 @@
     select * from
     hy_open_area_info
     where area_path like  concat('%',#{keyword},'%')
+    <if test="filterData!=null and filterData==true">
+      and province_city_flag = 1
+    </if>
   </select>
 
 

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

@@ -202,4 +202,18 @@
     </set>
     where id = #{record.id}
   </update>
+
+
+  <update id="updateByPartnerId">
+  update hy_partner_base_info
+    <set>
+    <if test="userName != null and userName!=''">
+      username = #{record.username},
+    </if>
+    <if test="mobile != null and mobile!=''">
+      mobile = #{record.mobile},
+    </if>
+      where partner_id = #{partnerId}
+    </set>
+  </update>
 </mapper>

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

@@ -295,7 +295,8 @@
       a.workflow_status as workflowStatus,
       a.partner_id as partnerUserId,
       a.investment_manager as investmentManager,
-      b.user_portrait as user_portrait
+      b.user_portrait as user_portrait,
+      b.id as partnerBaseInfoId
     from hy_partner_line_info a inner join hy_partner_base_info b
     on a.id = b.partner_line_id
     <where>