From 29d7fafb766ed9eec51da333cda5eb5de979647a Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 09 Mar 2022 11:37:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/energy/entity/Energy.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/energy/entity/Energy.java b/src/main/java/org/springblade/modules/energy/entity/Energy.java
index cf981c2..71b4057 100644
--- a/src/main/java/org/springblade/modules/energy/entity/Energy.java
+++ b/src/main/java/org/springblade/modules/energy/entity/Energy.java
@@ -48,6 +48,7 @@
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	private Date time;
 	private String type;
+	private Integer num;
 
 
 }

--
Gitblit v1.9.3