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 | 42 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 41 insertions(+), 1 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 c4d2671..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;
@@ -59,6 +61,12 @@
* 订单明细id 不明确
*/
private Long orderItemId;
+
+ /**
+ * 订单id
+ */
+ @Extend
+ private Long orderId;
/**
* 单次扣减金额（理解为单次手工业绩）
@@ -132,6 +140,38 @@
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;
}
--
Gitblit v1.9.1