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

maven

7 天以前 b1b59aac99c3d465d51e5fb4f7ab8185ddb733d2

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

@@ -25,6 +25,9 @@
    @Autowired
    private IDeviceRepairService deviceRepairService;

    @Autowired
    private IDeviceLedgerService deviceLedgerService;

    @ApiModelProperty("设备报修列表")
    @GetMapping("/page")
    public AjaxResult page(Page page , DeviceRepairDto deviceRepairDto) {