From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0

---
 zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjUse.java |   85 +++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 82 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjUse.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjUse.java
index d0e921b..a019374 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjUse.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjUse.java
@@ -2,7 +2,9 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.matrix.core.anotations.Extend;
+import com.matrix.core.pojo.EntityDTO;
 import com.matrix.core.tools.DateUtil;
+import com.matrix.system.common.bean.EntityDTOExt;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
@@ -13,7 +15,7 @@
 /**
  * @date 2016-07-03 20:53
  */
-public class SysProjUse implements Serializable {
+public class SysProjUse extends EntityDTO {
 
     private static final long serialVersionUID = 1L;
 
@@ -47,17 +49,24 @@
     @JsonFormat(pattern = DateUtil.DATE_FORMAT_DD, timezone = "GMT+8")
     @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_DD)
     private Date failTime;
+
+
+    private Date targetFailTime;
     /**
      * 套餐id
      */
     private Long taocanId;
 
-
-
     /**
      * 订单明细id 不明确
      */
     private Long orderItemId;
+
+    /**
+     * 订单id
+     */
+    @Extend
+    private Long orderId;
 
     /**
      * 单次扣减金额（理解为单次手工业绩）
@@ -125,6 +134,76 @@
      */
     private Integer deductionNum;
 
+    private Integer timeLength;
+
+    private String img;
+
+    private String queryKey;
+
+    @Extend
+    private String updateRemark;
+
+    /**
+     * 套餐/项目剩余次数
+     */
+    private Integer remainCount;
+
+    public Integer getRemainCount() {
+        return remainCount;
+    }
+
+    public void setRemainCount(Integer remainCount) {
+        this.remainCount = remainCount;
+    }
+
+    public Long getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Long orderId) {
+        this.orderId = orderId;
+    }
+
+    public String getUpdateRemark() {
+        return updateRemark;
+    }
+
+    public void setUpdateRemark(String updateRemark) {
+        this.updateRemark = updateRemark;
+    }
+
+    public Date getTargetFailTime() {
+        return targetFailTime;
+    }
+
+    public void setTargetFailTime(Date targetFailTime) {
+        this.targetFailTime = targetFailTime;
+    }
+
+    public String getQueryKey() {
+        return queryKey;
+    }
+
+    public void setQueryKey(String queryKey) {
+        this.queryKey = queryKey;
+    }
+
+    public Integer getTimeLength() {
+        return timeLength;
+    }
+
+    public void setTimeLength(Integer timeLength) {
+        this.timeLength = timeLength;
+    }
+
+    public String getImg() {
+        return img;
+    }
+
+    public void setImg(String img) {
+        this.img = img;
+    }
+
     public String getIsInfinite() {
         return isInfinite;
     }

--
Gitblit v1.9.1