Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-07 3b8f9eaa550172ec455bba3a9c52809f67b2c9ee

 base-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java

@@ -66,6 +66,12 @@
        return Result.success(maps);
    }

    @ApiOperation(value = "新增仪器设备：设备组下拉框")
    @GetMapping("/list_group")
    public Result<?> listGroup() {
        return Result.success(deviceService.listGroup());
    }

    @ApiOperation(value = "新增仪器设备")
    @PostMapping("/add")
    public Result<?> addDevice(@RequestBody DeviceDto deviceDto) {