Merge branch 'master' of https://g.civnet.cn:8443/test/maintenance

src/pages/userCenter/UserManage.less

@@ -27,7 +27,7 @@
             overflow: hidden;
             text-overflow: ellipsis;
             white-space: nowrap;
-            display: block;
+            // display: block;
         }
     }
     .ant-pagination-prev,.ant-pagination-next{

src/pages/userCenter/roleManage/RoleManage.jsx

@@ -12,7 +12,11 @@ import {
   Space,
 } from 'antd';
 import PageContainer from '@/components/BasePageContainer';
-import { DoubleLeftOutlined, DoubleRightOutlined } from '@ant-design/icons';
+import {
+  DoubleLeftOutlined,
+  DoubleRightOutlined,
+  UnorderedListOutlined,
+} from '@ant-design/icons';
 import {
   setMenuToRole,
   getRoleGroupList,
@@ -199,6 +203,7 @@ const SiteManage = () => {
             itemRole.title = itemRole.visibleTitle || '';
             itemRole.key = itemRole.visibleTitle + itemRole.visibleValue || '';
             itemRole.groupflag = itemRole.visibleTitle;
+            itemRole.icon = mulu ? <UnorderedListOutlined /> : '';
             itemRole.roleList.map(i => {
               i.title = i.roleName;
               i.key = i.roleID;

src/pages/userCenter/roleManage/RoleManage.less

@@ -53,3 +53,8 @@
   transform: translate(0%,-50%);
   z-index: 2;
 }
+
+.anticon-unordered-list{
+  vertical-align: 0.125em;
+  color:#1890FF;
+}