Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

9 天以前 936f4bd8b7837051ff63773be6d2d9c4b402b168

 src/main/java/com/ruoyi/equipmentenergyconsumption/pojo/EnergyPeriod.java

@@ -18,7 +18,7 @@
     * 日期
     */
    @ApiModelProperty("日期")
    @Excel(name = "日期")
    @Excel(name = "日期", width = 30, dateFormat = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date date;
    /**