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

云

2026-04-23 a1b154bfd4c5e138d964e1bfdc5a2bcac1e25488

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

@@ -56,4 +56,11 @@
    @ApiModelProperty("尖段")
    @Excel(name = "尖段")
    private Double sharp;
    @ApiModelProperty(value = "创建用户")
    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;

    @TableField(fill = FieldFill.INSERT)
    private Long deptId;

}