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

zss

7 天以前 8a5ac1e030826485463c078cdde03a065b45a960

 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;