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

maven

7 天以前 259e978c64b36f57aa1959c6d760416b86b26c34

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