From 1a20adbee4043a7b4a9e51565e7ac0f99d06c36d Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sat, 24 Apr 2021 20:21:24 +0800
Subject: [PATCH] Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into data_move
---
zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java
index dd76b14..341d013 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java
@@ -18,6 +18,15 @@
private static final long serialVersionUID = 1L;
+ private List<AchieveNew> achieveNews;
+
+ public List<AchieveNew> getAchieveNews() {
+ return achieveNews;
+ }
+
+ public void setAchieveNews(List<AchieveNew> achieveNews) {
+ this.achieveNews = achieveNews;
+ }
/**
* 序号
@@ -43,6 +52,8 @@
/**
* 订单划扣时间
*/
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
private Date consumeTime;
/**
@@ -251,6 +262,10 @@
private Integer totalTime;
+ /**
+ * 到时提醒次数
+ */
+ private Integer overtimeNotice;
@@ -332,6 +347,15 @@
@Extend
private String pageFlae;
+
+ public Integer getOvertimeNotice() {
+ return overtimeNotice;
+ }
+
+ public void setOvertimeNotice(Integer overtimeNotice) {
+ this.overtimeNotice = overtimeNotice;
+ }
+
public String getPageFlae() {
return pageFlae;
}
--
Gitblit v1.9.1