Merge branch 'dev_tide' into dev_tide_gybjyhglxt

zouyu

3 天以前 0b0b8419586505154a7e57e7c32c9a44329347ce

 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) {