From b088628cf9be70c36e34032bb0d024548351541b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 11 三月 2023 17:37:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAppUser.java |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAppUser.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAppUser.java
index a53ccae..3074beb 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAppUser.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAppUser.java
@@ -89,6 +89,15 @@
     @TableField(value = "remark")
     private String remark;
 
+    /**
+     * 取消订单次数,取消一次添加一次,若成功接单清零
+     */
+    @TableField(value = "cancelCount")
+    private Integer cancelCount;
+
+    @ApiModelProperty(value = "是否拥有9折优惠 1是 0否")
+    @TableField(value = "havDiscount")
+    private Integer havDiscount;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "注册开始时间")
@@ -98,6 +107,22 @@
     @ApiModelProperty(value = "注册结束时间")
     private Date endTime;
 
+    public Integer getHavDiscount() {
+        return havDiscount;
+    }
+
+    public void setHavDiscount(Integer havDiscount) {
+        this.havDiscount = havDiscount;
+    }
+
+    public Integer getCancelCount() {
+        return cancelCount;
+    }
+
+    public void setCancelCount(Integer cancelCount) {
+        this.cancelCount = cancelCount;
+    }
+
     public Integer getIsException() {
         return isException;
     }

--
Gitblit v1.7.1