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

yaowanxin

2026-01-20 d4b9db2b8958355b9960d57088af9865bb2b2f0d

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