Merge branch 'dev_New_pro' into dev_新疆马铃薯pro

云

6 天以前 16338016e73791cecbbdbdd73e972b29a06c59b1

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

@@ -22,6 +22,9 @@
    @Schema(description = "设备台账id")
    private Long deviceLedgerId;

    @Schema(description = "设备区域ID")
    private Long areaId;

    private String deviceName;

    private String deviceModel;