Merge branch 'develop' of http://git.ycjcjy.com/marketing/services into develop

src/main/resources/mapper/xlk/CustomerSignatoryMapper.xml

@@ -36,7 +36,6 @@
         t.org_id = #{orgId}
         <if test="buildingId != null and buildingId != ''">
             and t.building_id = #{buildingId}
-            and p.nickname like concat('%', #{params.nickname}, '%')
         </if>
         <if test="name != null and name != ''">
             and c.name like concat('%', #{name}, '%')