From dd1c643be561ebfbb521431b49d6e1e65bfcbd81 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:49:07 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/lwc/lexRemoveBox/lexRemoveBox.html | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/force-app/main/default/lwc/lexRemoveBox/lexRemoveBox.html b/force-app/main/default/lwc/lexRemoveBox/lexRemoveBox.html
index 9a67917..a11966b 100644
--- a/force-app/main/default/lwc/lexRemoveBox/lexRemoveBox.html
+++ b/force-app/main/default/lwc/lexRemoveBox/lexRemoveBox.html
@@ -128,7 +128,7 @@
鑾峰彇鏄庣粏
</button>
<!-- <lightning-button variant="brand" class='lexstyle' label="鑾峰彇鏄庣粏" title="鑾峰彇鏄庣粏" onclick={getDetails}
- ></lightning-button> -->
+ ></lightning-button> -->
</td>
</tr>
</tbody>
@@ -209,9 +209,9 @@
<!-- <template if:true={showTables}> -->
<!-- <c-lex-custom-lightning-datatable key-field="id" data={errorDetail} columns={column}
- onrowselection={getSelectedRows} hide-checkbox-column="true"
- selected-rows={selectedRows}>
- </c-lex-custom-lightning-datatable> -->
+ onrowselection={getSelectedRows} hide-checkbox-column="true"
+ selected-rows={selectedRows}>
+ </c-lex-custom-lightning-datatable> -->
<lightning-datatable
key-field="id"
data={errorDetail}
@@ -228,4 +228,4 @@
</div>
</div>
</div>
-</template>
\ No newline at end of file
+</template>
--
Gitblit v1.9.1