fix: merge conflicts

2021-12-10 13:58:50 +07:00 · 2021-12-10 13:58:50 +07:00 · d3ecd09d6f
commit d3ecd09d6f
parent 412ecc827e
1 changed files with 2 additions and 2 deletions
--- a/src/component/ProductComponent.js
+++ b/src/component/ProductComponent.js
@ -56,8 +56,8 @@ export const ProductComponent = observer((props) => {
        },
        {
            title: "Harga Beli",
-            dataIndex: "basePrice",
-            key: "basePrice",
+            dataIndex: "price",
+            key: "price",
        },
        {
            title: "Harga Jual",