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

liyong

2 天以前 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd

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

@@ -34,8 +34,8 @@

    @Schema(description = "报修内容")
    private String remark;
    
    @Schema(description = "设备类目")

    @Schema(description = "设备项目")
    private String machineryCategory;