Merge branch 'dev' of http://10.2.1.24:10244/bpa/BPA.KitChen.Web into dev

src/pages/sys/dictionary/dictdata/components/CreateForm.jsx

@@ -17,8 +17,11 @@ const CreateForm = (props) => {
       maskClosable={false}
     >
       <Form
-        layout="vertical"
-        preserve={false}
+       preserve={false}
+       layout="horizontal"
+       labelCol={{
+           span: 4,
+       }}
         initialValues={props.values}
         onFinish={props.onFinish}
       >

src/pages/sys/roles/index.jsx

@@ -212,6 +212,11 @@ const roleManager = () => {
       title: '角色名称',
       dataIndex: 'name',
     },
+    {
+      title: '备注',
+      dataIndex: 'remark',
+      hideInSearch: true,
+    },
     {
       title: '状态',
       dataIndex: 'status',

src/pages/sys/user/components/CreateForm.jsx

@@ -39,8 +39,8 @@ const CreateForm = (props) => {
                 <Form.Item name="id" hidden={true}>
                     <Input />
                 </Form.Item>
-                <Form.Item name="account" label="用户账户" rules={[{ required: true, max: 255 }]}>
-                    <Input placeholder="请输入用户账户"  disabled={props.values.id?true:false} />
+                <Form.Item name="account" label="登录账户" rules={[{ required: true, max: 255 }]}>
+                    <Input placeholder="请输入登录账户"  disabled={props.values.id?true:false} />
                 </Form.Item>
                 <Form.Item name="name" label="用户姓名" rules={[{ required: true, max: 255 }]}>
                     <Input placeholder="请输入用户姓名" />

src/pages/sys/user/index.jsx

@@ -228,29 +228,6 @@ const userManager = () => {
       title: '登录账户',
       dataIndex: 'account'
     },
-    {
-      title: '账户类型',
-      dataIndex: 'adminType',
-      hideInSearch: true,
-      valueEnum: {
-        0: {
-          text: '无',
-          status: 'Default',
-        },
-        1: {
-          text: '超级管理员',
-          status: 'Processing',
-        },
-        2: {
-          text: '管理员',
-          status: 'Success',
-        },
-        3: {
-          text: '普通账号',
-          status: 'Default',
-        },
-      },
-    },
     {
       title: '状态',
       dataIndex: 'status',