Merge remote-tracking branch 'origin/master'

xuhy

3 天以前 d72d88f9e19ead4bbc2f69c4f5fbe66b1edbdc31

 ruoyi-system/src/main/java/com/ruoyi/system/vo/TErpMaintenanceReminderListVo.java

@@ -41,5 +41,8 @@
    private LocalDateTime maintenanceTime;


    @ApiModelProperty(value = "状态 1=未维护 2=已维护")
    private Integer status;


}