Merge remote-tracking branch 'origin/master' into pim_yys

maven

2025-08-12 9ea2e9763d84581ac3b2040c27cf30f0d53468da

 src/main/java/com/ruoyi/device/pojo/DeviceMaintenance.java

@@ -22,6 +22,11 @@
    @ApiModelProperty("设备台账id")
    private Long deviceLedgerId;


    private String deviceName;

    private String deviceModel;

    @ApiModelProperty("计划保养日期")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")