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

jd-logistics-modules/jd-logistics-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -67,6 +67,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="userName != null and userName != ''">
 			AND u.user_name like concat('%', #{userName}, '%')
 		</if>
+		<if test="nickName != null and nickName != ''">
+			AND u.nick_name like concat('%', #{nickName}, '%')
+		</if>
 		<if test="status != null and status != ''">
 			AND u.status = #{status}
 		</if>

jd-logistics-ui-v3/src/views/system/dept/index.vue

@@ -55,7 +55,7 @@
          :default-expand-all="isExpandAll"
          :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
       >
-         <el-table-column prop="deptName" label="供应商名称" width="180"></el-table-column>
+         <el-table-column prop="deptName" label="供应商名称" width="230" :show-overflow-tooltip="true"></el-table-column>
 <!--         <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>-->
         <el-table-column prop="rateValue" label="费率" width="50"></el-table-column>
         <el-table-column prop="status" label="状态" width="100">