From d1f26741bddf6f512d62c0100d42c52be8d37e76 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 06 二月 2021 15:35:40 +0800
Subject: [PATCH] 工具类优化

---
 utils/src/main/java/org/yeshi/utils/entity/DateInfo.java |  272 ++++++++++++++++++++++++++++++------------------------
 1 files changed, 151 insertions(+), 121 deletions(-)

diff --git a/utils/src/main/java/org/yeshi/utils/entity/DateInfo.java b/utils/src/main/java/org/yeshi/utils/entity/DateInfo.java
index 3b978b6..6ea3b65 100644
--- a/utils/src/main/java/org/yeshi/utils/entity/DateInfo.java
+++ b/utils/src/main/java/org/yeshi/utils/entity/DateInfo.java
@@ -1,121 +1,151 @@
-package org.yeshi.utils.entity;
-
-public class DateInfo {
-
-	// 褰撳墠骞�
-	private Integer year;
-	// 褰撳墠鏈�
-	private Integer month;
-	// 褰撳墠鏃�
-	private Integer day;
-
-	// 褰撳墠鏄熸湡鍑�
-	private String weekDay;
-
-	// 鍐滃巻-骞�
-	private String lunar_year;
-	// 鍐滃巻-鏈�
-	private String lunar_month;
-	// 鍐滃巻-鏃�
-	private String lunar_day;
-
-	// 澶╁共鍦版敮-骞�
-	private String agenary_year;
-	// 澶╁共鍦版敮-鏈�
-	private String agenary_month;
-	// 澶╁共鍦版敮-鏃�
-	private String agenary_day;
-	// 澶╁共鍦版敮-鏃惰景
-	private String agenary_hour;
-	
-	
-
-	public Integer getYear() {
-		return year;
-	}
-
-	public void setYear(Integer year) {
-		this.year = year;
-	}
-
-	public Integer getMonth() {
-		return month;
-	}
-
-	public void setMonth(Integer month) {
-		this.month = month;
-	}
-
-	public Integer getDay() {
-		return day;
-	}
-
-	public void setDay(Integer day) {
-		this.day = day;
-	}
-
-	public String getWeekDay() {
-		return weekDay;
-	}
-
-	public void setWeekDay(String weekDay) {
-		this.weekDay = weekDay;
-	}
-
-	public String getLunar_year() {
-		return lunar_year;
-	}
-
-	public void setLunar_year(String lunar_year) {
-		this.lunar_year = lunar_year;
-	}
-
-	public String getLunar_month() {
-		return lunar_month;
-	}
-
-	public void setLunar_month(String lunar_month) {
-		this.lunar_month = lunar_month;
-	}
-
-	public String getLunar_day() {
-		return lunar_day;
-	}
-
-	public void setLunar_day(String lunar_day) {
-		this.lunar_day = lunar_day;
-	}
-
-	public String getAgenary_year() {
-		return agenary_year;
-	}
-
-	public void setAgenary_year(String agenary_year) {
-		this.agenary_year = agenary_year;
-	}
-
-	public String getAgenary_month() {
-		return agenary_month;
-	}
-
-	public void setAgenary_month(String agenary_month) {
-		this.agenary_month = agenary_month;
-	}
-
-	public String getAgenary_day() {
-		return agenary_day;
-	}
-
-	public void setAgenary_day(String agenary_day) {
-		this.agenary_day = agenary_day;
-	}
-
-	public String getAgenary_hour() {
-		return agenary_hour;
-	}
-
-	public void setAgenary_hour(String agenary_hour) {
-		this.agenary_hour = agenary_hour;
-	}
-
-}
+package org.yeshi.utils.entity;
+
+public class DateInfo {
+
+	// 褰撳墠骞�
+	private Integer year;
+	// 褰撳墠鏈�
+	private Integer month;
+	// 褰撳墠鏃�
+	private Integer day;
+
+	// 褰撳墠鏄熸湡鍑�
+	private String weekDay;
+
+	// 鍐滃巻-骞�
+	private String lunar_year;
+	// 鍐滃巻-鏈�
+	private String lunar_month;
+	// 鍐滃巻-鏃�
+	private String lunar_day;
+
+	// 澶╁共鍦版敮-骞�
+	private String agenary_year;
+	// 澶╁共鍦版敮-鏈�
+	private String agenary_month;
+	// 澶╁共鍦版敮-鏃�
+	private String agenary_day;
+	// 澶╁共鍦版敮-鏃惰景
+	private String agenary_hour;
+	
+	
+	// 灏忔椂
+	private Long hour;
+	// 鍒嗛挓
+	private Long minute;
+	// 绉掓暟
+	private Long second;
+	
+
+	public Integer getYear() {
+		return year;
+	}
+
+	public void setYear(Integer year) {
+		this.year = year;
+	}
+
+	public Integer getMonth() {
+		return month;
+	}
+
+	public void setMonth(Integer month) {
+		this.month = month;
+	}
+
+	public Integer getDay() {
+		return day;
+	}
+
+	public void setDay(Integer day) {
+		this.day = day;
+	}
+
+	public String getWeekDay() {
+		return weekDay;
+	}
+
+	public void setWeekDay(String weekDay) {
+		this.weekDay = weekDay;
+	}
+
+	public String getLunar_year() {
+		return lunar_year;
+	}
+
+	public void setLunar_year(String lunar_year) {
+		this.lunar_year = lunar_year;
+	}
+
+	public String getLunar_month() {
+		return lunar_month;
+	}
+
+	public void setLunar_month(String lunar_month) {
+		this.lunar_month = lunar_month;
+	}
+
+	public String getLunar_day() {
+		return lunar_day;
+	}
+
+	public void setLunar_day(String lunar_day) {
+		this.lunar_day = lunar_day;
+	}
+
+	public String getAgenary_year() {
+		return agenary_year;
+	}
+
+	public void setAgenary_year(String agenary_year) {
+		this.agenary_year = agenary_year;
+	}
+
+	public String getAgenary_month() {
+		return agenary_month;
+	}
+
+	public void setAgenary_month(String agenary_month) {
+		this.agenary_month = agenary_month;
+	}
+
+	public String getAgenary_day() {
+		return agenary_day;
+	}
+
+	public void setAgenary_day(String agenary_day) {
+		this.agenary_day = agenary_day;
+	}
+
+	public String getAgenary_hour() {
+		return agenary_hour;
+	}
+
+	public void setAgenary_hour(String agenary_hour) {
+		this.agenary_hour = agenary_hour;
+	}
+
+	public Long getHour() {
+		return hour;
+	}
+
+	public void setHour(Long hour) {
+		this.hour = hour;
+	}
+
+	public Long getMinute() {
+		return minute;
+	}
+
+	public void setMinute(Long minute) {
+		this.minute = minute;
+	}
+
+	public Long getSecond() {
+		return second;
+	}
+
+	public void setSecond(Long second) {
+		this.second = second;
+	}
+}

--
Gitblit v1.8.0