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

liyong

4 天以前 877504ede165b8c965b6cf6599708e7e48778034

 src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java

@@ -42,6 +42,8 @@
    @Autowired
    private DeviceMaintenanceMapper deviceMaintenanceMapper;



    @ApiModelProperty("设备台账列表")
    @GetMapping("/page")
    public AjaxResult page(Page page , DeviceLedgerDto deviceLedger) {