Merge remote-tracking branch 'origin/master'

zengh

2021-11-05 b39cc2beacc1ec2e37cff349cae42e420105c8a6

 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;


}