Merge branch 'dev_New' into dev_宁夏_中盛建材

zss

10 天以前 43113d6b1670530dfb4348836fd491c79f36af0a

 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;
    /**