From d7cfe9c24193ecea57653b18e5034e04d09b7b5e Mon Sep 17 00:00:00 2001 From: YunaiV Date: Mon, 8 Jun 2026 00:22:02 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=90=8C=E6=AD=A5=E3=80=91BOOT=20?= =?UTF-8?q?=E5=92=8C=20CLOUD=20=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/InfraStudentController | 8 ++++---- .../java/InfraStudentSaveReqVO | 2 +- .../java/InfraStudentService | 2 +- .../java/InfraStudentServiceImpl | 2 +- .../java/InfraStudentServiceImplTest | 4 ++-- .../java/InfraStudentController | 8 ++++---- .../java/InfraStudentSaveReqVO | 2 +- .../java/InfraStudentService | 2 +- .../java/InfraStudentServiceImpl | 2 +- .../java/InfraStudentServiceImplTest | 4 ++-- .../java/InfraStudentController | 8 ++++---- .../java/InfraStudentSaveReqVO | 2 +- .../java/InfraStudentService | 2 +- .../java/InfraStudentServiceImpl | 2 +- .../java/InfraStudentServiceImplTest | 4 ++-- .../vben5_antd_general_one/java/InfraStudentController | 8 ++++---- .../vben5_antd_general_one/java/InfraStudentSaveReqVO | 2 +- .../vben5_antd_general_one/java/InfraStudentService | 2 +- .../vben5_antd_general_one/java/InfraStudentServiceImpl | 2 +- .../java/InfraStudentServiceImplTest | 4 ++-- .../java/InfraStudentController | 8 ++++---- .../java/InfraStudentSaveReqVO | 2 +- .../java/InfraStudentService | 2 +- .../java/InfraStudentServiceImpl | 2 +- .../java/InfraStudentServiceImplTest | 4 ++-- .../vben5_antd_general_tree/java/InfraCategoryController | 8 ++++---- .../vben5_antd_general_tree/java/InfraCategorySaveReqVO | 2 +- .../vben5_antd_general_tree/java/InfraCategoryService | 2 +- .../vben5_antd_general_tree/java/InfraCategoryServiceImpl | 2 +- .../java/InfraCategoryServiceImplTest | 4 ++-- .../java/InfraStudentController | 8 ++++---- .../java/InfraStudentSaveReqVO | 2 +- .../vben5_antd_schema_master_erp/java/InfraStudentService | 2 +- .../java/InfraStudentServiceImpl | 2 +- .../java/InfraStudentServiceImplTest | 4 ++-- .../java/InfraStudentController | 8 ++++---- .../java/InfraStudentSaveReqVO | 2 +- .../java/InfraStudentService | 2 +- .../java/InfraStudentServiceImpl | 2 +- .../java/InfraStudentServiceImplTest | 4 ++-- .../java/InfraStudentController | 8 ++++---- .../java/InfraStudentSaveReqVO | 2 +- .../java/InfraStudentService | 2 +- .../java/InfraStudentServiceImpl | 2 +- .../java/InfraStudentServiceImplTest | 4 ++-- .../vben5_antd_schema_one/java/InfraStudentController | 8 ++++---- .../vben5_antd_schema_one/java/InfraStudentSaveReqVO | 2 +- .../vben5_antd_schema_one/java/InfraStudentService | 2 +- .../vben5_antd_schema_one/java/InfraStudentServiceImpl | 2 +- .../java/InfraStudentServiceImplTest | 4 ++-- .../java/InfraStudentController | 8 ++++---- .../java/InfraStudentSaveReqVO | 2 +- .../java/InfraStudentService | 2 +- .../java/InfraStudentServiceImpl | 2 +- .../java/InfraStudentServiceImplTest | 4 ++-- .../vben5_antd_schema_tree/java/InfraCategoryController | 8 ++++---- .../vben5_antd_schema_tree/java/InfraCategorySaveReqVO | 2 +- .../vben5_antd_schema_tree/java/InfraCategoryService | 2 +- .../vben5_antd_schema_tree/java/InfraCategoryServiceImpl | 2 +- .../java/InfraCategoryServiceImplTest | 4 ++-- .../java/InfraStudentController | 8 ++++---- .../java/InfraStudentSaveReqVO | 2 +- .../vben5_ele_general_master_erp/java/InfraStudentService | 2 +- .../java/InfraStudentServiceImpl | 2 +- .../java/InfraStudentServiceImplTest | 4 ++-- .../java/InfraStudentController | 8 ++++---- .../java/InfraStudentSaveReqVO | 2 +- .../java/InfraStudentService | 2 +- .../java/InfraStudentServiceImpl | 2 +- .../java/InfraStudentServiceImplTest | 4 ++-- .../java/InfraStudentController | 8 ++++---- .../java/InfraStudentSaveReqVO | 2 +- .../java/InfraStudentService | 2 +- .../java/InfraStudentServiceImpl | 2 +- .../java/InfraStudentServiceImplTest | 4 ++-- .../vben5_ele_general_one/java/InfraStudentController | 8 ++++---- .../vben5_ele_general_one/java/InfraStudentSaveReqVO | 2 +- .../vben5_ele_general_one/java/InfraStudentService | 2 +- .../vben5_ele_general_one/java/InfraStudentServiceImpl | 2 +- .../java/InfraStudentServiceImplTest | 4 ++-- .../java/InfraStudentController | 8 ++++---- .../java/InfraStudentSaveReqVO | 2 +- .../java/InfraStudentService | 2 +- .../java/InfraStudentServiceImpl | 2 +- .../java/InfraStudentServiceImplTest | 4 ++-- .../vben5_ele_general_tree/java/InfraCategoryController | 8 ++++---- .../vben5_ele_general_tree/java/InfraCategorySaveReqVO | 2 +- .../vben5_ele_general_tree/java/InfraCategoryService | 2 +- .../vben5_ele_general_tree/java/InfraCategoryServiceImpl | 2 +- .../java/InfraCategoryServiceImplTest | 4 ++-- .../java/InfraStudentController | 8 ++++---- .../java/InfraStudentSaveReqVO | 2 +- .../vben5_ele_schema_master_erp/java/InfraStudentService | 2 +- .../java/InfraStudentServiceImpl | 2 +- .../java/InfraStudentServiceImplTest | 4 ++-- .../java/InfraStudentController | 8 ++++---- .../java/InfraStudentSaveReqVO | 2 +- .../java/InfraStudentService | 2 +- .../java/InfraStudentServiceImpl | 2 +- .../java/InfraStudentServiceImplTest | 4 ++-- .../java/InfraStudentController | 8 ++++---- .../java/InfraStudentSaveReqVO | 2 +- .../java/InfraStudentService | 2 +- .../java/InfraStudentServiceImpl | 2 +- .../java/InfraStudentServiceImplTest | 4 ++-- .../vben5_ele_schema_one/java/InfraStudentController | 8 ++++---- .../vben5_ele_schema_one/java/InfraStudentSaveReqVO | 2 +- .../codegen/vben5_ele_schema_one/java/InfraStudentService | 2 +- .../vben5_ele_schema_one/java/InfraStudentServiceImpl | 2 +- .../vben5_ele_schema_one/java/InfraStudentServiceImplTest | 4 ++-- .../java/InfraStudentController | 8 ++++---- .../java/InfraStudentSaveReqVO | 2 +- .../java/InfraStudentService | 2 +- .../java/InfraStudentServiceImpl | 2 +- .../java/InfraStudentServiceImplTest | 4 ++-- .../vben5_ele_schema_tree/java/InfraCategoryController | 8 ++++---- .../vben5_ele_schema_tree/java/InfraCategorySaveReqVO | 2 +- .../vben5_ele_schema_tree/java/InfraCategoryService | 2 +- .../vben5_ele_schema_tree/java/InfraCategoryServiceImpl | 2 +- .../java/InfraCategoryServiceImplTest | 4 ++-- .../codegen/vue2_master_erp/java/InfraStudentController | 8 ++++---- .../codegen/vue2_master_erp/java/InfraStudentSaveReqVO | 2 +- .../codegen/vue2_master_erp/java/InfraStudentService | 2 +- .../codegen/vue2_master_erp/java/InfraStudentServiceImpl | 2 +- .../vue2_master_erp/java/InfraStudentServiceImplTest | 4 ++-- .../codegen/vue2_master_inner/java/InfraStudentController | 8 ++++---- .../codegen/vue2_master_inner/java/InfraStudentSaveReqVO | 2 +- .../codegen/vue2_master_inner/java/InfraStudentService | 2 +- .../vue2_master_inner/java/InfraStudentServiceImpl | 2 +- .../vue2_master_inner/java/InfraStudentServiceImplTest | 4 ++-- .../vue2_master_normal/java/InfraStudentController | 8 ++++---- .../codegen/vue2_master_normal/java/InfraStudentSaveReqVO | 2 +- .../codegen/vue2_master_normal/java/InfraStudentService | 2 +- .../vue2_master_normal/java/InfraStudentServiceImpl | 2 +- .../vue2_master_normal/java/InfraStudentServiceImplTest | 4 ++-- .../codegen/vue2_one/java/InfraStudentController | 8 ++++---- .../resources/codegen/vue2_one/java/InfraStudentSaveReqVO | 2 +- .../resources/codegen/vue2_one/java/InfraStudentService | 2 +- .../codegen/vue2_one/java/InfraStudentServiceImpl | 2 +- .../codegen/vue2_one/java/InfraStudentServiceImplTest | 4 ++-- .../vue2_one_importEnable/java/InfraStudentController | 8 ++++---- .../vue2_one_importEnable/java/InfraStudentSaveReqVO | 2 +- .../vue2_one_importEnable/java/InfraStudentService | 2 +- .../vue2_one_importEnable/java/InfraStudentServiceImpl | 2 +- .../java/InfraStudentServiceImplTest | 4 ++-- .../codegen/vue2_tree/java/InfraCategoryController | 8 ++++---- .../codegen/vue2_tree/java/InfraCategorySaveReqVO | 2 +- .../resources/codegen/vue2_tree/java/InfraCategoryService | 2 +- .../codegen/vue2_tree/java/InfraCategoryServiceImpl | 2 +- .../codegen/vue2_tree/java/InfraCategoryServiceImplTest | 4 ++-- .../vue3_admin_uniapp_one/java/InfraStudentController | 8 ++++---- .../vue3_admin_uniapp_one/java/InfraStudentSaveReqVO | 2 +- .../vue3_admin_uniapp_one/java/InfraStudentService | 2 +- .../vue3_admin_uniapp_one/java/InfraStudentServiceImpl | 2 +- .../java/InfraStudentServiceImplTest | 4 ++-- .../codegen/vue3_master_erp/java/InfraStudentController | 8 ++++---- .../codegen/vue3_master_erp/java/InfraStudentSaveReqVO | 2 +- .../codegen/vue3_master_erp/java/InfraStudentService | 2 +- .../codegen/vue3_master_erp/java/InfraStudentServiceImpl | 2 +- .../vue3_master_erp/java/InfraStudentServiceImplTest | 4 ++-- .../codegen/vue3_master_inner/java/InfraStudentController | 8 ++++---- .../codegen/vue3_master_inner/java/InfraStudentSaveReqVO | 2 +- .../codegen/vue3_master_inner/java/InfraStudentService | 2 +- .../vue3_master_inner/java/InfraStudentServiceImpl | 2 +- .../vue3_master_inner/java/InfraStudentServiceImplTest | 4 ++-- .../vue3_master_normal/java/InfraStudentController | 8 ++++---- .../codegen/vue3_master_normal/java/InfraStudentSaveReqVO | 2 +- .../codegen/vue3_master_normal/java/InfraStudentService | 2 +- .../vue3_master_normal/java/InfraStudentServiceImpl | 2 +- .../vue3_master_normal/java/InfraStudentServiceImplTest | 4 ++-- .../codegen/vue3_one/java/InfraStudentController | 8 ++++---- .../resources/codegen/vue3_one/java/InfraStudentSaveReqVO | 2 +- .../resources/codegen/vue3_one/java/InfraStudentService | 2 +- .../codegen/vue3_one/java/InfraStudentServiceImpl | 2 +- .../codegen/vue3_one/java/InfraStudentServiceImplTest | 4 ++-- .../vue3_one_importEnable/java/InfraStudentController | 8 ++++---- .../vue3_one_importEnable/java/InfraStudentSaveReqVO | 2 +- .../vue3_one_importEnable/java/InfraStudentService | 2 +- .../vue3_one_importEnable/java/InfraStudentServiceImpl | 2 +- .../java/InfraStudentServiceImplTest | 4 ++-- .../codegen/vue3_tree/java/InfraCategoryController | 8 ++++---- .../codegen/vue3_tree/java/InfraCategorySaveReqVO | 2 +- .../resources/codegen/vue3_tree/java/InfraCategoryService | 2 +- .../codegen/vue3_tree/java/InfraCategoryServiceImpl | 2 +- .../codegen/vue3_tree/java/InfraCategoryServiceImplTest | 4 ++-- 185 files changed, 333 insertions(+), 333 deletions(-) diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_erp/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_erp/java/InfraStudentController index 868993d6a..02bd59728 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_erp/java/InfraStudentController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_erp/java/InfraStudentController @@ -1,16 +1,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_erp/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_erp/java/InfraStudentSaveReqVO index 19e75d0ba..2378872d2 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_erp/java/InfraStudentSaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_erp/java/InfraStudentSaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_erp/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_erp/java/InfraStudentService index 070941ba5..fea24fab2 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_erp/java/InfraStudentService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_erp/java/InfraStudentService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_erp/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_erp/java/InfraStudentServiceImpl index 8a42bce2c..6c86267ae 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_erp/java/InfraStudentServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_erp/java/InfraStudentServiceImpl @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_erp/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_erp/java/InfraStudentServiceImplTest index fa325938c..f1d3bb923 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_erp/java/InfraStudentServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_erp/java/InfraStudentServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_inner/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_inner/java/InfraStudentController index b0542f32f..0c9a9f956 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_inner/java/InfraStudentController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_inner/java/InfraStudentController @@ -1,16 +1,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_inner/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_inner/java/InfraStudentSaveReqVO index 0e8370d09..4cde1f896 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_inner/java/InfraStudentSaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_inner/java/InfraStudentSaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_inner/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_inner/java/InfraStudentService index 6a3ccee72..0a3ee84da 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_inner/java/InfraStudentService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_inner/java/InfraStudentService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_inner/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_inner/java/InfraStudentServiceImpl index edfe8baf7..31d689e12 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_inner/java/InfraStudentServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_inner/java/InfraStudentServiceImpl @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_inner/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_inner/java/InfraStudentServiceImplTest index fa325938c..f1d3bb923 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_inner/java/InfraStudentServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_inner/java/InfraStudentServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_normal/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_normal/java/InfraStudentController index b0542f32f..0c9a9f956 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_normal/java/InfraStudentController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_normal/java/InfraStudentController @@ -1,16 +1,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_normal/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_normal/java/InfraStudentSaveReqVO index 0e8370d09..4cde1f896 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_normal/java/InfraStudentSaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_normal/java/InfraStudentSaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_normal/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_normal/java/InfraStudentService index 6a3ccee72..0a3ee84da 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_normal/java/InfraStudentService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_normal/java/InfraStudentService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_normal/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_normal/java/InfraStudentServiceImpl index edfe8baf7..31d689e12 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_normal/java/InfraStudentServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_normal/java/InfraStudentServiceImpl @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_normal/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_normal/java/InfraStudentServiceImplTest index fa325938c..f1d3bb923 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_normal/java/InfraStudentServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_master_normal/java/InfraStudentServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one/java/InfraStudentController index 9f0065846..cb3519954 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one/java/InfraStudentController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one/java/InfraStudentController @@ -1,16 +1,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one/java/InfraStudentSaveReqVO index 0d6e3b9ba..cdb6e92ce 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one/java/InfraStudentSaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one/java/InfraStudentSaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one/java/InfraStudentService index 3d9f94129..cab590e41 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one/java/InfraStudentService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one/java/InfraStudentService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one/java/InfraStudentServiceImpl index fa857440f..38b346a6d 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one/java/InfraStudentServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one/java/InfraStudentServiceImpl @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one/java/InfraStudentServiceImplTest index fa325938c..f1d3bb923 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one/java/InfraStudentServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one/java/InfraStudentServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one_importEnable/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one_importEnable/java/InfraStudentController index 8367c4919..b8827f6e2 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one_importEnable/java/InfraStudentController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one_importEnable/java/InfraStudentController @@ -2,16 +2,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one_importEnable/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one_importEnable/java/InfraStudentSaveReqVO index 0d6e3b9ba..cdb6e92ce 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one_importEnable/java/InfraStudentSaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one_importEnable/java/InfraStudentSaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one_importEnable/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one_importEnable/java/InfraStudentService index dffbb0c77..65dbd7277 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one_importEnable/java/InfraStudentService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one_importEnable/java/InfraStudentService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one_importEnable/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one_importEnable/java/InfraStudentServiceImpl index b82a3ba85..81e9ffe41 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one_importEnable/java/InfraStudentServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one_importEnable/java/InfraStudentServiceImpl @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one_importEnable/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one_importEnable/java/InfraStudentServiceImplTest index fa325938c..f1d3bb923 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one_importEnable/java/InfraStudentServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_one_importEnable/java/InfraStudentServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_tree/java/InfraCategoryController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_tree/java/InfraCategoryController index 8cec077ef..7725253a2 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_tree/java/InfraCategoryController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_tree/java/InfraCategoryController @@ -1,16 +1,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_tree/java/InfraCategorySaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_tree/java/InfraCategorySaveReqVO index ea3c18b63..584679560 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_tree/java/InfraCategorySaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_tree/java/InfraCategorySaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; @Schema(description = "管理后台 - 分类新增/修改 Request VO") @Data diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_tree/java/InfraCategoryService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_tree/java/InfraCategoryService index 176212d8a..df887b08d 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_tree/java/InfraCategoryService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_tree/java/InfraCategoryService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraCategoryDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_tree/java/InfraCategoryServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_tree/java/InfraCategoryServiceImpl index 18dbbb22a..ecf35667b 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_tree/java/InfraCategoryServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_tree/java/InfraCategoryServiceImpl @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_tree/java/InfraCategoryServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_tree/java/InfraCategoryServiceImplTest index 74c58e147..92672ee1f 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_tree/java/InfraCategoryServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_general_tree/java/InfraCategoryServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraCategoryDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraCategoryMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_erp/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_erp/java/InfraStudentController index 868993d6a..02bd59728 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_erp/java/InfraStudentController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_erp/java/InfraStudentController @@ -1,16 +1,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_erp/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_erp/java/InfraStudentSaveReqVO index 19e75d0ba..2378872d2 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_erp/java/InfraStudentSaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_erp/java/InfraStudentSaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_erp/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_erp/java/InfraStudentService index 070941ba5..fea24fab2 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_erp/java/InfraStudentService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_erp/java/InfraStudentService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_erp/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_erp/java/InfraStudentServiceImpl index 8a42bce2c..6c86267ae 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_erp/java/InfraStudentServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_erp/java/InfraStudentServiceImpl @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_erp/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_erp/java/InfraStudentServiceImplTest index fa325938c..f1d3bb923 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_erp/java/InfraStudentServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_erp/java/InfraStudentServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_inner/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_inner/java/InfraStudentController index b0542f32f..0c9a9f956 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_inner/java/InfraStudentController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_inner/java/InfraStudentController @@ -1,16 +1,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_inner/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_inner/java/InfraStudentSaveReqVO index 0e8370d09..4cde1f896 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_inner/java/InfraStudentSaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_inner/java/InfraStudentSaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_inner/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_inner/java/InfraStudentService index 6a3ccee72..0a3ee84da 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_inner/java/InfraStudentService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_inner/java/InfraStudentService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_inner/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_inner/java/InfraStudentServiceImpl index edfe8baf7..31d689e12 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_inner/java/InfraStudentServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_inner/java/InfraStudentServiceImpl @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_inner/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_inner/java/InfraStudentServiceImplTest index fa325938c..f1d3bb923 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_inner/java/InfraStudentServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_inner/java/InfraStudentServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_normal/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_normal/java/InfraStudentController index b0542f32f..0c9a9f956 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_normal/java/InfraStudentController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_normal/java/InfraStudentController @@ -1,16 +1,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_normal/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_normal/java/InfraStudentSaveReqVO index 0e8370d09..4cde1f896 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_normal/java/InfraStudentSaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_normal/java/InfraStudentSaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_normal/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_normal/java/InfraStudentService index 6a3ccee72..0a3ee84da 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_normal/java/InfraStudentService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_normal/java/InfraStudentService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_normal/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_normal/java/InfraStudentServiceImpl index edfe8baf7..31d689e12 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_normal/java/InfraStudentServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_normal/java/InfraStudentServiceImpl @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_normal/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_normal/java/InfraStudentServiceImplTest index fa325938c..f1d3bb923 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_normal/java/InfraStudentServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_master_normal/java/InfraStudentServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one/java/InfraStudentController index 9f0065846..cb3519954 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one/java/InfraStudentController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one/java/InfraStudentController @@ -1,16 +1,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one/java/InfraStudentSaveReqVO index 0d6e3b9ba..cdb6e92ce 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one/java/InfraStudentSaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one/java/InfraStudentSaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one/java/InfraStudentService index 3d9f94129..cab590e41 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one/java/InfraStudentService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one/java/InfraStudentService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one/java/InfraStudentServiceImpl index fa857440f..38b346a6d 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one/java/InfraStudentServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one/java/InfraStudentServiceImpl @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one/java/InfraStudentServiceImplTest index fa325938c..f1d3bb923 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one/java/InfraStudentServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one/java/InfraStudentServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one_importEnable/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one_importEnable/java/InfraStudentController index 8367c4919..b8827f6e2 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one_importEnable/java/InfraStudentController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one_importEnable/java/InfraStudentController @@ -2,16 +2,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one_importEnable/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one_importEnable/java/InfraStudentSaveReqVO index 0d6e3b9ba..cdb6e92ce 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one_importEnable/java/InfraStudentSaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one_importEnable/java/InfraStudentSaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one_importEnable/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one_importEnable/java/InfraStudentService index dffbb0c77..65dbd7277 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one_importEnable/java/InfraStudentService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one_importEnable/java/InfraStudentService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one_importEnable/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one_importEnable/java/InfraStudentServiceImpl index b82a3ba85..81e9ffe41 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one_importEnable/java/InfraStudentServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one_importEnable/java/InfraStudentServiceImpl @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one_importEnable/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one_importEnable/java/InfraStudentServiceImplTest index fa325938c..f1d3bb923 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one_importEnable/java/InfraStudentServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_one_importEnable/java/InfraStudentServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_tree/java/InfraCategoryController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_tree/java/InfraCategoryController index 8cec077ef..7725253a2 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_tree/java/InfraCategoryController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_tree/java/InfraCategoryController @@ -1,16 +1,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_tree/java/InfraCategorySaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_tree/java/InfraCategorySaveReqVO index ea3c18b63..584679560 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_tree/java/InfraCategorySaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_tree/java/InfraCategorySaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; @Schema(description = "管理后台 - 分类新增/修改 Request VO") @Data diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_tree/java/InfraCategoryService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_tree/java/InfraCategoryService index 176212d8a..df887b08d 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_tree/java/InfraCategoryService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_tree/java/InfraCategoryService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraCategoryDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_tree/java/InfraCategoryServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_tree/java/InfraCategoryServiceImpl index 18dbbb22a..ecf35667b 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_tree/java/InfraCategoryServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_tree/java/InfraCategoryServiceImpl @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_tree/java/InfraCategoryServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_tree/java/InfraCategoryServiceImplTest index 74c58e147..92672ee1f 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_tree/java/InfraCategoryServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_antd_schema_tree/java/InfraCategoryServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraCategoryDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraCategoryMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_erp/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_erp/java/InfraStudentController index 868993d6a..02bd59728 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_erp/java/InfraStudentController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_erp/java/InfraStudentController @@ -1,16 +1,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_erp/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_erp/java/InfraStudentSaveReqVO index 19e75d0ba..2378872d2 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_erp/java/InfraStudentSaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_erp/java/InfraStudentSaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_erp/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_erp/java/InfraStudentService index 070941ba5..fea24fab2 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_erp/java/InfraStudentService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_erp/java/InfraStudentService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_erp/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_erp/java/InfraStudentServiceImpl index 8a42bce2c..6c86267ae 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_erp/java/InfraStudentServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_erp/java/InfraStudentServiceImpl @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_erp/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_erp/java/InfraStudentServiceImplTest index fa325938c..f1d3bb923 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_erp/java/InfraStudentServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_erp/java/InfraStudentServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_inner/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_inner/java/InfraStudentController index b0542f32f..0c9a9f956 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_inner/java/InfraStudentController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_inner/java/InfraStudentController @@ -1,16 +1,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_inner/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_inner/java/InfraStudentSaveReqVO index 0e8370d09..4cde1f896 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_inner/java/InfraStudentSaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_inner/java/InfraStudentSaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_inner/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_inner/java/InfraStudentService index 6a3ccee72..0a3ee84da 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_inner/java/InfraStudentService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_inner/java/InfraStudentService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_inner/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_inner/java/InfraStudentServiceImpl index edfe8baf7..31d689e12 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_inner/java/InfraStudentServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_inner/java/InfraStudentServiceImpl @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_inner/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_inner/java/InfraStudentServiceImplTest index fa325938c..f1d3bb923 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_inner/java/InfraStudentServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_inner/java/InfraStudentServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_normal/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_normal/java/InfraStudentController index b0542f32f..0c9a9f956 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_normal/java/InfraStudentController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_normal/java/InfraStudentController @@ -1,16 +1,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_normal/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_normal/java/InfraStudentSaveReqVO index 0e8370d09..4cde1f896 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_normal/java/InfraStudentSaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_normal/java/InfraStudentSaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_normal/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_normal/java/InfraStudentService index 6a3ccee72..0a3ee84da 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_normal/java/InfraStudentService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_normal/java/InfraStudentService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_normal/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_normal/java/InfraStudentServiceImpl index edfe8baf7..31d689e12 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_normal/java/InfraStudentServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_normal/java/InfraStudentServiceImpl @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_normal/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_normal/java/InfraStudentServiceImplTest index fa325938c..f1d3bb923 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_normal/java/InfraStudentServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_master_normal/java/InfraStudentServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one/java/InfraStudentController index 9f0065846..cb3519954 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one/java/InfraStudentController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one/java/InfraStudentController @@ -1,16 +1,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one/java/InfraStudentSaveReqVO index 0d6e3b9ba..cdb6e92ce 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one/java/InfraStudentSaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one/java/InfraStudentSaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one/java/InfraStudentService index 3d9f94129..cab590e41 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one/java/InfraStudentService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one/java/InfraStudentService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one/java/InfraStudentServiceImpl index fa857440f..38b346a6d 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one/java/InfraStudentServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one/java/InfraStudentServiceImpl @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one/java/InfraStudentServiceImplTest index fa325938c..f1d3bb923 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one/java/InfraStudentServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one/java/InfraStudentServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one_importEnable/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one_importEnable/java/InfraStudentController index 8367c4919..b8827f6e2 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one_importEnable/java/InfraStudentController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one_importEnable/java/InfraStudentController @@ -2,16 +2,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one_importEnable/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one_importEnable/java/InfraStudentSaveReqVO index 0d6e3b9ba..cdb6e92ce 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one_importEnable/java/InfraStudentSaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one_importEnable/java/InfraStudentSaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one_importEnable/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one_importEnable/java/InfraStudentService index dffbb0c77..65dbd7277 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one_importEnable/java/InfraStudentService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one_importEnable/java/InfraStudentService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one_importEnable/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one_importEnable/java/InfraStudentServiceImpl index b82a3ba85..81e9ffe41 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one_importEnable/java/InfraStudentServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one_importEnable/java/InfraStudentServiceImpl @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one_importEnable/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one_importEnable/java/InfraStudentServiceImplTest index fa325938c..f1d3bb923 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one_importEnable/java/InfraStudentServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_one_importEnable/java/InfraStudentServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_tree/java/InfraCategoryController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_tree/java/InfraCategoryController index 8cec077ef..7725253a2 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_tree/java/InfraCategoryController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_tree/java/InfraCategoryController @@ -1,16 +1,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_tree/java/InfraCategorySaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_tree/java/InfraCategorySaveReqVO index ea3c18b63..584679560 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_tree/java/InfraCategorySaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_tree/java/InfraCategorySaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; @Schema(description = "管理后台 - 分类新增/修改 Request VO") @Data diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_tree/java/InfraCategoryService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_tree/java/InfraCategoryService index 176212d8a..df887b08d 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_tree/java/InfraCategoryService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_tree/java/InfraCategoryService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraCategoryDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_tree/java/InfraCategoryServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_tree/java/InfraCategoryServiceImpl index 18dbbb22a..ecf35667b 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_tree/java/InfraCategoryServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_tree/java/InfraCategoryServiceImpl @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_tree/java/InfraCategoryServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_tree/java/InfraCategoryServiceImplTest index 74c58e147..92672ee1f 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_tree/java/InfraCategoryServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_general_tree/java/InfraCategoryServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraCategoryDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraCategoryMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_erp/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_erp/java/InfraStudentController index 868993d6a..02bd59728 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_erp/java/InfraStudentController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_erp/java/InfraStudentController @@ -1,16 +1,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_erp/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_erp/java/InfraStudentSaveReqVO index 19e75d0ba..2378872d2 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_erp/java/InfraStudentSaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_erp/java/InfraStudentSaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_erp/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_erp/java/InfraStudentService index 070941ba5..fea24fab2 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_erp/java/InfraStudentService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_erp/java/InfraStudentService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_erp/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_erp/java/InfraStudentServiceImpl index 8a42bce2c..6c86267ae 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_erp/java/InfraStudentServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_erp/java/InfraStudentServiceImpl @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_erp/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_erp/java/InfraStudentServiceImplTest index fa325938c..f1d3bb923 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_erp/java/InfraStudentServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_erp/java/InfraStudentServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_inner/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_inner/java/InfraStudentController index b0542f32f..0c9a9f956 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_inner/java/InfraStudentController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_inner/java/InfraStudentController @@ -1,16 +1,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_inner/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_inner/java/InfraStudentSaveReqVO index 0e8370d09..4cde1f896 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_inner/java/InfraStudentSaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_inner/java/InfraStudentSaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_inner/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_inner/java/InfraStudentService index 6a3ccee72..0a3ee84da 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_inner/java/InfraStudentService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_inner/java/InfraStudentService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_inner/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_inner/java/InfraStudentServiceImpl index edfe8baf7..31d689e12 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_inner/java/InfraStudentServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_inner/java/InfraStudentServiceImpl @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_inner/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_inner/java/InfraStudentServiceImplTest index fa325938c..f1d3bb923 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_inner/java/InfraStudentServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_inner/java/InfraStudentServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_normal/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_normal/java/InfraStudentController index b0542f32f..0c9a9f956 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_normal/java/InfraStudentController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_normal/java/InfraStudentController @@ -1,16 +1,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_normal/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_normal/java/InfraStudentSaveReqVO index 0e8370d09..4cde1f896 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_normal/java/InfraStudentSaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_normal/java/InfraStudentSaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_normal/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_normal/java/InfraStudentService index 6a3ccee72..0a3ee84da 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_normal/java/InfraStudentService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_normal/java/InfraStudentService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_normal/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_normal/java/InfraStudentServiceImpl index edfe8baf7..31d689e12 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_normal/java/InfraStudentServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_normal/java/InfraStudentServiceImpl @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_normal/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_normal/java/InfraStudentServiceImplTest index fa325938c..f1d3bb923 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_normal/java/InfraStudentServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_master_normal/java/InfraStudentServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one/java/InfraStudentController index 9f0065846..cb3519954 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one/java/InfraStudentController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one/java/InfraStudentController @@ -1,16 +1,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one/java/InfraStudentSaveReqVO index 0d6e3b9ba..cdb6e92ce 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one/java/InfraStudentSaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one/java/InfraStudentSaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one/java/InfraStudentService index 3d9f94129..cab590e41 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one/java/InfraStudentService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one/java/InfraStudentService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one/java/InfraStudentServiceImpl index fa857440f..38b346a6d 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one/java/InfraStudentServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one/java/InfraStudentServiceImpl @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one/java/InfraStudentServiceImplTest index fa325938c..f1d3bb923 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one/java/InfraStudentServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one/java/InfraStudentServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one_importEnable/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one_importEnable/java/InfraStudentController index 8367c4919..b8827f6e2 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one_importEnable/java/InfraStudentController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one_importEnable/java/InfraStudentController @@ -2,16 +2,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one_importEnable/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one_importEnable/java/InfraStudentSaveReqVO index 0d6e3b9ba..cdb6e92ce 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one_importEnable/java/InfraStudentSaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one_importEnable/java/InfraStudentSaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one_importEnable/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one_importEnable/java/InfraStudentService index dffbb0c77..65dbd7277 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one_importEnable/java/InfraStudentService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one_importEnable/java/InfraStudentService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one_importEnable/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one_importEnable/java/InfraStudentServiceImpl index b82a3ba85..81e9ffe41 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one_importEnable/java/InfraStudentServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one_importEnable/java/InfraStudentServiceImpl @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one_importEnable/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one_importEnable/java/InfraStudentServiceImplTest index fa325938c..f1d3bb923 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one_importEnable/java/InfraStudentServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_one_importEnable/java/InfraStudentServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_tree/java/InfraCategoryController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_tree/java/InfraCategoryController index 8cec077ef..7725253a2 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_tree/java/InfraCategoryController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_tree/java/InfraCategoryController @@ -1,16 +1,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_tree/java/InfraCategorySaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_tree/java/InfraCategorySaveReqVO index ea3c18b63..584679560 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_tree/java/InfraCategorySaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_tree/java/InfraCategorySaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; @Schema(description = "管理后台 - 分类新增/修改 Request VO") @Data diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_tree/java/InfraCategoryService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_tree/java/InfraCategoryService index 176212d8a..df887b08d 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_tree/java/InfraCategoryService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_tree/java/InfraCategoryService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraCategoryDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_tree/java/InfraCategoryServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_tree/java/InfraCategoryServiceImpl index 18dbbb22a..ecf35667b 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_tree/java/InfraCategoryServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_tree/java/InfraCategoryServiceImpl @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_tree/java/InfraCategoryServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_tree/java/InfraCategoryServiceImplTest index 74c58e147..92672ee1f 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_tree/java/InfraCategoryServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vben5_ele_schema_tree/java/InfraCategoryServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraCategoryDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraCategoryMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_erp/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_erp/java/InfraStudentController index 868993d6a..02bd59728 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_erp/java/InfraStudentController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_erp/java/InfraStudentController @@ -1,16 +1,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_erp/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_erp/java/InfraStudentSaveReqVO index 19e75d0ba..2378872d2 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_erp/java/InfraStudentSaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_erp/java/InfraStudentSaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_erp/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_erp/java/InfraStudentService index 070941ba5..fea24fab2 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_erp/java/InfraStudentService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_erp/java/InfraStudentService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_erp/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_erp/java/InfraStudentServiceImpl index 8a42bce2c..6c86267ae 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_erp/java/InfraStudentServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_erp/java/InfraStudentServiceImpl @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_erp/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_erp/java/InfraStudentServiceImplTest index fa325938c..f1d3bb923 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_erp/java/InfraStudentServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_erp/java/InfraStudentServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_inner/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_inner/java/InfraStudentController index b0542f32f..0c9a9f956 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_inner/java/InfraStudentController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_inner/java/InfraStudentController @@ -1,16 +1,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_inner/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_inner/java/InfraStudentSaveReqVO index 0e8370d09..4cde1f896 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_inner/java/InfraStudentSaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_inner/java/InfraStudentSaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_inner/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_inner/java/InfraStudentService index 6a3ccee72..0a3ee84da 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_inner/java/InfraStudentService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_inner/java/InfraStudentService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_inner/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_inner/java/InfraStudentServiceImpl index edfe8baf7..31d689e12 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_inner/java/InfraStudentServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_inner/java/InfraStudentServiceImpl @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_inner/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_inner/java/InfraStudentServiceImplTest index fa325938c..f1d3bb923 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_inner/java/InfraStudentServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_inner/java/InfraStudentServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_normal/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_normal/java/InfraStudentController index b0542f32f..0c9a9f956 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_normal/java/InfraStudentController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_normal/java/InfraStudentController @@ -1,16 +1,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_normal/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_normal/java/InfraStudentSaveReqVO index 0e8370d09..4cde1f896 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_normal/java/InfraStudentSaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_normal/java/InfraStudentSaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_normal/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_normal/java/InfraStudentService index 6a3ccee72..0a3ee84da 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_normal/java/InfraStudentService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_normal/java/InfraStudentService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_normal/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_normal/java/InfraStudentServiceImpl index edfe8baf7..31d689e12 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_normal/java/InfraStudentServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_normal/java/InfraStudentServiceImpl @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_normal/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_normal/java/InfraStudentServiceImplTest index fa325938c..f1d3bb923 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_normal/java/InfraStudentServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_master_normal/java/InfraStudentServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one/java/InfraStudentController index 9f0065846..cb3519954 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one/java/InfraStudentController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one/java/InfraStudentController @@ -1,16 +1,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one/java/InfraStudentSaveReqVO index 0d6e3b9ba..cdb6e92ce 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one/java/InfraStudentSaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one/java/InfraStudentSaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one/java/InfraStudentService index 3d9f94129..cab590e41 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one/java/InfraStudentService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one/java/InfraStudentService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one/java/InfraStudentServiceImpl index fa857440f..38b346a6d 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one/java/InfraStudentServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one/java/InfraStudentServiceImpl @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one/java/InfraStudentServiceImplTest index fa325938c..f1d3bb923 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one/java/InfraStudentServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one/java/InfraStudentServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one_importEnable/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one_importEnable/java/InfraStudentController index 8367c4919..b8827f6e2 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one_importEnable/java/InfraStudentController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one_importEnable/java/InfraStudentController @@ -2,16 +2,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one_importEnable/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one_importEnable/java/InfraStudentSaveReqVO index 0d6e3b9ba..cdb6e92ce 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one_importEnable/java/InfraStudentSaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one_importEnable/java/InfraStudentSaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one_importEnable/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one_importEnable/java/InfraStudentService index dffbb0c77..65dbd7277 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one_importEnable/java/InfraStudentService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one_importEnable/java/InfraStudentService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one_importEnable/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one_importEnable/java/InfraStudentServiceImpl index b82a3ba85..81e9ffe41 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one_importEnable/java/InfraStudentServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one_importEnable/java/InfraStudentServiceImpl @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one_importEnable/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one_importEnable/java/InfraStudentServiceImplTest index fa325938c..f1d3bb923 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one_importEnable/java/InfraStudentServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_one_importEnable/java/InfraStudentServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_tree/java/InfraCategoryController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_tree/java/InfraCategoryController index 8cec077ef..7725253a2 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_tree/java/InfraCategoryController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_tree/java/InfraCategoryController @@ -1,16 +1,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_tree/java/InfraCategorySaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_tree/java/InfraCategorySaveReqVO index ea3c18b63..584679560 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_tree/java/InfraCategorySaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_tree/java/InfraCategorySaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; @Schema(description = "管理后台 - 分类新增/修改 Request VO") @Data diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_tree/java/InfraCategoryService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_tree/java/InfraCategoryService index 176212d8a..df887b08d 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_tree/java/InfraCategoryService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_tree/java/InfraCategoryService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraCategoryDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_tree/java/InfraCategoryServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_tree/java/InfraCategoryServiceImpl index 18dbbb22a..ecf35667b 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_tree/java/InfraCategoryServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_tree/java/InfraCategoryServiceImpl @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_tree/java/InfraCategoryServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_tree/java/InfraCategoryServiceImplTest index 74c58e147..92672ee1f 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_tree/java/InfraCategoryServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue2_tree/java/InfraCategoryServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraCategoryDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraCategoryMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_admin_uniapp_one/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_admin_uniapp_one/java/InfraStudentController index 9f0065846..cb3519954 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_admin_uniapp_one/java/InfraStudentController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_admin_uniapp_one/java/InfraStudentController @@ -1,16 +1,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_admin_uniapp_one/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_admin_uniapp_one/java/InfraStudentSaveReqVO index 0d6e3b9ba..cdb6e92ce 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_admin_uniapp_one/java/InfraStudentSaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_admin_uniapp_one/java/InfraStudentSaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_admin_uniapp_one/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_admin_uniapp_one/java/InfraStudentService index 3d9f94129..cab590e41 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_admin_uniapp_one/java/InfraStudentService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_admin_uniapp_one/java/InfraStudentService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_admin_uniapp_one/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_admin_uniapp_one/java/InfraStudentServiceImpl index fa857440f..38b346a6d 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_admin_uniapp_one/java/InfraStudentServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_admin_uniapp_one/java/InfraStudentServiceImpl @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_admin_uniapp_one/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_admin_uniapp_one/java/InfraStudentServiceImplTest index fa325938c..f1d3bb923 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_admin_uniapp_one/java/InfraStudentServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_admin_uniapp_one/java/InfraStudentServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_erp/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_erp/java/InfraStudentController index 868993d6a..02bd59728 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_erp/java/InfraStudentController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_erp/java/InfraStudentController @@ -1,16 +1,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_erp/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_erp/java/InfraStudentSaveReqVO index 19e75d0ba..2378872d2 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_erp/java/InfraStudentSaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_erp/java/InfraStudentSaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_erp/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_erp/java/InfraStudentService index 070941ba5..fea24fab2 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_erp/java/InfraStudentService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_erp/java/InfraStudentService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_erp/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_erp/java/InfraStudentServiceImpl index 8a42bce2c..6c86267ae 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_erp/java/InfraStudentServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_erp/java/InfraStudentServiceImpl @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_erp/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_erp/java/InfraStudentServiceImplTest index fa325938c..f1d3bb923 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_erp/java/InfraStudentServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_erp/java/InfraStudentServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_inner/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_inner/java/InfraStudentController index b0542f32f..0c9a9f956 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_inner/java/InfraStudentController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_inner/java/InfraStudentController @@ -1,16 +1,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_inner/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_inner/java/InfraStudentSaveReqVO index 0e8370d09..4cde1f896 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_inner/java/InfraStudentSaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_inner/java/InfraStudentSaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_inner/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_inner/java/InfraStudentService index 6a3ccee72..0a3ee84da 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_inner/java/InfraStudentService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_inner/java/InfraStudentService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_inner/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_inner/java/InfraStudentServiceImpl index edfe8baf7..31d689e12 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_inner/java/InfraStudentServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_inner/java/InfraStudentServiceImpl @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_inner/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_inner/java/InfraStudentServiceImplTest index fa325938c..f1d3bb923 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_inner/java/InfraStudentServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_inner/java/InfraStudentServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_normal/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_normal/java/InfraStudentController index b0542f32f..0c9a9f956 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_normal/java/InfraStudentController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_normal/java/InfraStudentController @@ -1,16 +1,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_normal/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_normal/java/InfraStudentSaveReqVO index 0e8370d09..4cde1f896 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_normal/java/InfraStudentSaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_normal/java/InfraStudentSaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_normal/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_normal/java/InfraStudentService index 6a3ccee72..0a3ee84da 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_normal/java/InfraStudentService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_normal/java/InfraStudentService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentContactDO; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_normal/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_normal/java/InfraStudentServiceImpl index edfe8baf7..31d689e12 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_normal/java/InfraStudentServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_normal/java/InfraStudentServiceImpl @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_normal/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_normal/java/InfraStudentServiceImplTest index fa325938c..f1d3bb923 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_normal/java/InfraStudentServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_master_normal/java/InfraStudentServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one/java/InfraStudentController index 9f0065846..cb3519954 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one/java/InfraStudentController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one/java/InfraStudentController @@ -1,16 +1,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one/java/InfraStudentSaveReqVO index 0d6e3b9ba..cdb6e92ce 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one/java/InfraStudentSaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one/java/InfraStudentSaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one/java/InfraStudentService index 3d9f94129..cab590e41 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one/java/InfraStudentService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one/java/InfraStudentService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one/java/InfraStudentServiceImpl index fa857440f..38b346a6d 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one/java/InfraStudentServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one/java/InfraStudentServiceImpl @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one/java/InfraStudentServiceImplTest index fa325938c..f1d3bb923 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one/java/InfraStudentServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one/java/InfraStudentServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one_importEnable/java/InfraStudentController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one_importEnable/java/InfraStudentController index 8367c4919..b8827f6e2 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one_importEnable/java/InfraStudentController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one_importEnable/java/InfraStudentController @@ -2,16 +2,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one_importEnable/java/InfraStudentSaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one_importEnable/java/InfraStudentSaveReqVO index 0d6e3b9ba..cdb6e92ce 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one_importEnable/java/InfraStudentSaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one_importEnable/java/InfraStudentSaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one_importEnable/java/InfraStudentService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one_importEnable/java/InfraStudentService index dffbb0c77..65dbd7277 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one_importEnable/java/InfraStudentService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one_importEnable/java/InfraStudentService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one_importEnable/java/InfraStudentServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one_importEnable/java/InfraStudentServiceImpl index b82a3ba85..81e9ffe41 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one_importEnable/java/InfraStudentServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one_importEnable/java/InfraStudentServiceImpl @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one_importEnable/java/InfraStudentServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one_importEnable/java/InfraStudentServiceImplTest index fa325938c..f1d3bb923 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one_importEnable/java/InfraStudentServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_one_importEnable/java/InfraStudentServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraStudentDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraStudentMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_tree/java/InfraCategoryController b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_tree/java/InfraCategoryController index 8cec077ef..7725253a2 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_tree/java/InfraCategoryController +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_tree/java/InfraCategoryController @@ -1,16 +1,16 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; -import javax.validation.constraints.*; -import javax.validation.*; -import javax.servlet.http.*; +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; import java.util.*; import java.io.IOException; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_tree/java/InfraCategorySaveReqVO b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_tree/java/InfraCategorySaveReqVO index ea3c18b63..584679560 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_tree/java/InfraCategorySaveReqVO +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_tree/java/InfraCategorySaveReqVO @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; @Schema(description = "管理后台 - 分类新增/修改 Request VO") @Data diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_tree/java/InfraCategoryService b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_tree/java/InfraCategoryService index 176212d8a..df887b08d 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_tree/java/InfraCategoryService +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_tree/java/InfraCategoryService @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import java.util.*; -import javax.validation.*; +import jakarta.validation.*; import cn.iocoder.yudao.module.infra.controller.admin.demo.vo.*; import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraCategoryDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_tree/java/InfraCategoryServiceImpl b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_tree/java/InfraCategoryServiceImpl index 18dbbb22a..ecf35667b 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_tree/java/InfraCategoryServiceImpl +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_tree/java/InfraCategoryServiceImpl @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; import org.springframework.stereotype.Service; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; diff --git a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_tree/java/InfraCategoryServiceImplTest b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_tree/java/InfraCategoryServiceImplTest index 74c58e147..92672ee1f 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_tree/java/InfraCategoryServiceImplTest +++ b/yudao-module-infra/yudao-module-infra-server/src/test/resources/codegen/vue3_tree/java/InfraCategoryServiceImplTest @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; @@ -12,7 +12,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.demo.InfraCategoryDO; import cn.iocoder.yudao.module.infra.dal.mysql.demo.InfraCategoryMapper; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.springframework.context.annotation.Import; import java.util.*; import java.time.LocalDateTime;