update disount

2020-10-15 18:48:32 +06:30
parent 50f7673e85
commit f2432a33a1
10 changed files with 163 additions and 106 deletions
--- a/lib/domain/entities/discount.dart
+++ b/lib/domain/entities/discount.dart
@@ -6,16 +6,6 @@ class Discount {
  String status;
  double amount;

-<<<<<<< HEAD
-  Discount(
-      {this.id,
-      this.code,
-      this.customer,
-      this.amount,
-      this.status,
-      this.weight,
-      this.discountRate});
-=======
  Discount({
    this.id,
    this.code,
@@ -45,5 +35,4 @@ class Discount {
      status: map['status'],
    );
  }
->>>>>>> upstream/master
 }