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

xiangpei

2024-07-01 55dd8a6e104190531b51402ad0be6eba0b7d6877

 src/main/java/com/ycl/jxkg/controller/student/EducationController.java

@@ -6,8 +6,8 @@
import com.ycl.jxkg.domain.entity.Subject;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.service.SubjectService;
import com.ycl.jxkg.vo.student.education.SubjectEditRequestVO;
import com.ycl.jxkg.vo.student.education.SubjectVO;
import com.ycl.jxkg.domain.vo.student.education.SubjectEditRequestVO;
import com.ycl.jxkg.domain.vo.student.education.SubjectVO;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;