Merge branch 'master' of lizhiqi/yongxu-web into master

src/pages/Infrared/brand/edit.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { Col, Form, Input, message, Modal, Row, Select } from 'antd';
+import { Col, Form, Input, InputNumber, message, Modal, Row, Select } from 'antd';
 import { queryInfraredCategory } from '@/services/Infrared/category';
 import { createInfraredBrands, updateInfraredBrands } from '@/services/Infrared/brand';
 
@@ -117,6 +117,17 @@ const Edit: React.FC<userEditPros> = (props) => {
               </Select>
             </Form.Item>
           </Col>
+          <Col span={24}>
+            <Form.Item
+              {...formItemLayout}
+              name="code"
+              label="品牌序号"
+              rules={[{ required: true, message: '请输入品牌序号' }]}
+              initialValue={detailData?.code || ''}
+            >
+              <InputNumber placeholder="请输入品牌序号" min={0} style={{ width: '100%' }} />
+            </Form.Item>
+          </Col>
         </Row>
       </Form>
     </Modal>

src/pages/Infrared/remote/edit.tsx

@@ -209,17 +209,6 @@ const Edit: React.FC<userEditPros> = (props) => {
               <InputNumber placeholder="请输入控制编码" style={{ width: '100%' }} />
             </Form.Item>
           </Col>
-          <Col span={24}>
-            <Form.Item
-              {...formItemLayout}
-              name="remote_map"
-              label="编码对应文件名称"
-              rules={[{ required: true, message: '请输入编码对应文件名称' }]}
-              initialValue={detailData?.remote_map || ''}
-            >
-              <Input placeholder="请输入编码对应文件名称" readOnly />
-            </Form.Item>
-          </Col>
           <Col span={24}>
             <Form.Item
               {...formItemLayout}
@@ -234,6 +223,17 @@ const Edit: React.FC<userEditPros> = (props) => {
               </Upload>
             </Form.Item>
           </Col>
+          <Col span={24}>
+            <Form.Item
+              {...formItemLayout}
+              name="remote_map"
+              label="编码对应文件名称"
+              rules={[{ required: true, message: '请输入编码对应文件名称' }]}
+              initialValue={detailData?.remote_map || ''}
+            >
+              <Input placeholder="请输入编码对应文件名称" readOnly />
+            </Form.Item>
+          </Col>
         </Row>
       </Form>
     </Modal>