Merge branch 'cc_20251029_smz' into 'master'

所属大区新增品牌筛选

See merge request hangzhou/java/custom_zxjp!190

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

@@ -38,6 +38,9 @@
       <if test="keyword!=null and keyword !=''">
         and region_name like CONCAT('%',#{keyword},'%')
       </if>
+      <if test="joinBrand != null">
+        and join_brand = #{joinBrand}
+      </if>
     </where>
   </select>