Merge remote-tracking branch 'origin/master'

zengh

2022-03-03 bc493033ebc2ab2bea86626f3cc66727cb993b7e

 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;


}