Merge remote-tracking branch 'origin/master'

zengh

2022-02-19 e2102f68ac95624ccefdcac1b51f85a6fd522975

 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;


}