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

云

2 天以前 8c0d4b8f762b1e1535379c604fdc8e2530dc6c8a

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

@@ -44,6 +44,10 @@
    @Schema(description = "设备id")
    private Long taskId;

    @Schema(description = "保养人")
    @Excel(name = "保养人")
    private String maintenancePerson;

    @Schema(description = "频次")
    @Excel(name = "频次")
    private String frequencyType;