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

liding

5 天以前 1284fb157043e488aa1794d8f1b64ebf18aa5147

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