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

xiangpei

2024-07-11 5073a245f53fd5ca936e779be8c6b9b19d42f67d

 src/main/java/com/ycl/jxkg/controller/admin/ClassesUserController.java

@@ -1,5 +1,6 @@
package com.ycl.jxkg.controller.admin;

import com.ycl.jxkg.domain.form.EditClassesUserForm;
import com.ycl.jxkg.group.Update;
import com.ycl.jxkg.group.Add;
import org.springframework.validation.annotation.Validated;
@@ -27,7 +28,7 @@
@RequiredArgsConstructor
@Api(value = "班级学员", tags = "班级学员")
@RestController
@RequestMapping("/api/classes-user")
@RequestMapping("/api/admin/classesUser")
public class ClassesUserController {

    private final ClassesUserService classesUserService;
@@ -35,15 +36,22 @@
    @PostMapping
    @ApiOperation(value = "添加", notes = "添加")
    @PreAuthorize("hasAuthority('classesUser:add')")
    public Result add(@RequestBody @Validated(Add.class) ClassesUserForm form) {
    public Result add(@RequestBody @Validated(Add.class) EditClassesUserForm form) {
        return classesUserService.add(form);
    }

    @PostMapping("/edit")
    @ApiOperation(value = "修改", notes = "修改")
    @PreAuthorize("hasAuthority('classesUser:edit')")
    public Result update(@RequestBody @Validated(Update.class) ClassesUserForm form) {
        return classesUserService.update(form);
    }

    @PutMapping
    @ApiOperation(value = "修改", notes = "修改")
    @PreAuthorize("hasAuthority('classesUser:edit')")
    public Result update(@RequestBody @Validated(Update.class) ClassesUserForm form) {
        return classesUserService.update(form);
    public Result edit(@RequestBody @Validated(Update.class) EditClassesUserForm form) {
        return classesUserService.edit(form);
    }

    @DeleteMapping("/{id}")