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

maven

9 天以前 b1b59aac99c3d465d51e5fb4f7ab8185ddb733d2

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

@@ -41,7 +41,7 @@
    private LocalDateTime maintenanceActuallyTime;

    @ApiModelProperty("保养结果 0 维修 1 完好")
    private Integer maintenanceResult;
    private String maintenanceResult;

    @ApiModelProperty("状态 0 待保养 1 完结")
    private Integer status;