Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

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

@@ -185,6 +185,8 @@
     select * from
     hy_open_area_info
     where area_status = 'keyOpen'
+    and province_city_flag = 1
+    and parent_id is null
   </select>
 
   <select id="queryByKeyword" resultMap="BaseResultMap">

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

@@ -38,7 +38,7 @@
     values
     <foreach collection="records" item="record" separator=",">
       (#{record.partnerId},
-      #{record.partnerLineId}
+      #{record.partnerLineId})
     </foreach>
   </insert>