Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-service/src/main/resources/mapper/DepartmentMapper.xml

@@ -301,7 +301,7 @@
 	    and   is_store = 1
 	    and   wx_enterprise_id = #{wxEnterpriseId}
 	    <if test="search != null and search != ''">
-    		and department_name like CONCAT('%',#{search},'%')
+    		and wx_department_id like CONCAT('%',#{search},'%')
    		</if>
    		<if test="storeIds != null and storeIds.size != 0">
 	    	and related_id IN