From c253b555c7905c5136d47cd615ef545fa50cc6ad Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 20 Feb 2022 21:24:16 +0800
Subject: [PATCH] Merge branch 'api_score_meger'

---
 zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjUseFlow.java |   96 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 96 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjUseFlow.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjUseFlow.java
new file mode 100644
index 0000000..5c23ed7
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjUseFlow.java
@@ -0,0 +1,96 @@
+package com.matrix.system.hive.bean;
+
+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 lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+
+/**项目余次操作记录
+ * @date 2016-07-03 20:53
+ */
+@Data
+public class SysProjUseFlow extends EntityDTO {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     */
+    private Long id;
+
+
+    /**
+     * 项目id
+     */
+    private Long projUseId;
+
+    /**
+     * 剩余次数
+     */
+    private Integer surplusCount;
+
+    /**
+     * 是否使用完成Y完成,N未完成
+     */
+    private String isOver;
+
+    /**
+     * 有效期
+     */
+    @JsonFormat(pattern = DateUtil.DATE_FORMAT_DD, timezone = "GMT+8")
+    @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_DD)
+    private Date failTime;
+
+    /**
+     * 单次扣减金额
+     */
+    private Double price;
+
+    /**
+     * 套餐状态,有效,无效,冻结,转让,退款
+     */
+    private String status;
+
+
+
+    /**
+     * 使用情况余额
+     */
+    private Double balance;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+
+    /**
+     * 项目名称
+     */
+    private String projName;
+
+    /**
+     * 操作类型
+     */
+    private String optionType;
+
+    /**
+     * 开始时间
+     */
+    @Extend
+    private String beginTime;
+
+    /**
+     *结束时间
+     */
+    @Extend
+    private String endTime;
+
+}

--
Gitblit v1.9.1