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