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

yaowanxin

4 天以前 ac135b66a5ab9f2f74c55961066974e815b88e9a

 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) {
@@ -34,6 +37,9 @@
    @PostMapping()
    @ApiModelProperty("添加设备报修")
    public AjaxResult add( @RequestBody DeviceRepair deviceRepair) {
        DeviceLedger byId = deviceLedgerService.getById(deviceRepair.getDeviceLedgerId());
        deviceRepair.setDeviceName(byId.getDeviceName());
        deviceRepair.setDeviceModel(byId.getDeviceModel());
        return deviceRepairService.saveDeviceRepair(deviceRepair);
    }