Merge branch 'master' into kitchenmanage

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

@@ -84,12 +84,12 @@ const CreateForm = (props) => {
             </Row>
           </Col>
         </Row>
-        {/* <Row>
+        <Row>
           <Col span={12}>
             <Form.Item
-              defaultValue={props.values.type}
-              name="type"
-              label="菜单层级"
+              defaultValue={props.values.isAdmin}
+              name="isAdmin"
+              label="超管菜单"
               rules={[{ required: true }]}
             >
               <ProFormRadio.Group
@@ -99,11 +99,11 @@ const CreateForm = (props) => {
                 }}
                 options={[
                   {
-                    label: '按钮',
+                    label: '否',
                     value: 0,
                   },
                   {
-                    label: '菜单',
+                    label: '是',
                     value: 1,
                   },
                 ]}
@@ -121,7 +121,7 @@ const CreateForm = (props) => {
               </Form.Item>
             )}
           </Col>
-        </Row> */}
+        </Row>
         <Form.Item>
         <Button  htmlType="button" style={{float:'right',left:10}} onClick={props.onCancel} >
                         取消