From 2d3ed60f6bffb23cc9ccc1d70e33b7660b7245cf Mon Sep 17 00:00:00 2001
From: heyx <heyx@yisa.com>
Date: Mon, 25 Sep 2023 17:37:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E7=A5=A8=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B5=E9=9D=A2=E8=AE=A2=E5=8D=95=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E7=9A=84=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/MerchantMgm/InvoiceConf/loadable.jsx   | 2 +-
 src/pages/MerchantMgm/MerchantAdmin/loadable.jsx | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/MerchantMgm/InvoiceConf/loadable.jsx b/src/pages/MerchantMgm/InvoiceConf/loadable.jsx
index 7a78bef..4060b72 100644
--- a/src/pages/MerchantMgm/InvoiceConf/loadable.jsx
+++ b/src/pages/MerchantMgm/InvoiceConf/loadable.jsx
@@ -349,7 +349,7 @@ function InvoiceConf() {
           editForm.setFieldsValue({
             tenantName: res.data.tenantName,
             invoice_item: res.data.invoice_item,
-            orderType: res.data.orderType,
+            order_type: res.data.order_type,
             sell_name: res.data.sell_name,
             sell_num: res.data.sell_num,
             drawer_name: res.data.drawer_name
diff --git a/src/pages/MerchantMgm/MerchantAdmin/loadable.jsx b/src/pages/MerchantMgm/MerchantAdmin/loadable.jsx
index 3d6509f..209cea1 100644
--- a/src/pages/MerchantMgm/MerchantAdmin/loadable.jsx
+++ b/src/pages/MerchantMgm/MerchantAdmin/loadable.jsx
@@ -350,7 +350,7 @@ function MerchantAdmin() {
   //编辑
   function updateBtn(record) {
     setUpdateVisible(true)
-    // setFormData(record)
+    setRecords(record)
     //数据回显
     updateForm.setFieldsValue(
       {
@@ -774,7 +774,7 @@ function MerchantAdmin() {
                         label="商户："
                         name="operatorid"
                       >
-                        {formData.shop_name}
+                        {records.shop_name}
                       </Form.Item>
 
                       <Form.Item
@@ -808,7 +808,7 @@ function MerchantAdmin() {
                         required={true}
                         rules={[{ required: true }]}
                       >
-                        {formData.account}
+                        {records.account}
                       </Form.Item>
 
                       <Form.Item