Merge remote-tracking branch 'origin/dev_tide_sbjkxt' into dev_tide_sbjkxt_...

zouyu

3 天以前 8f98ff2e202e5d7a39be484753db63d0165d70d7

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