版本跟新

yudao-module-mall/yudao-module-hshy-biz/pom.xml

@@ -98,10 +98,6 @@
             <groupId>cn.iocoder.cloud</groupId>
             <artifactId>yudao-spring-boot-starter-monitor</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/api/pointruleitem/PointRuleItemImpl.java

@@ -6,8 +6,9 @@ import cn.iocoder.yudao.module.hshy.api.pointruleitem.dto.PointRuleItemReqDTO;
 import cn.iocoder.yudao.module.hshy.dal.dataobject.pointruleitem.PointRuleItemDO;
 import cn.iocoder.yudao.module.hshy.service.pointruleitem.PointRuleItemService;
 import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuRespDTO;
+import jakarta.annotation.Resource;
+
 
-import javax.annotation.Resource;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/api/userblack/UserBlackApiImpl.java

@@ -6,7 +6,7 @@ import cn.iocoder.yudao.module.hshy.api.userblack.dto.UserBlackReqDTO;
 import cn.iocoder.yudao.module.hshy.dal.dataobject.userblack.UserBlackDO;
 import cn.iocoder.yudao.module.hshy.service.userblack.UserBlackService;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/controller/admin/extend/ExtendController.java

@@ -1,5 +1,8 @@
 package cn.iocoder.yudao.module.hshy.controller.admin.extend;
 
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -25,9 +28,7 @@ import cn.iocoder.yudao.module.hshy.controller.admin.extend.vo.*;
 import cn.iocoder.yudao.module.hshy.dal.dataobject.extend.ExtendDO;
 import cn.iocoder.yudao.module.hshy.service.extend.ExtendService;
 
-import javax.annotation.Resource;
+
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
 
 @Tag(name = "管理后台 - 商品扩展")
 @RestController

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/controller/admin/pointcongeal/PointCongealController.java

@@ -25,9 +25,9 @@ import cn.iocoder.yudao.module.hshy.controller.admin.pointcongeal.vo.*;
 import cn.iocoder.yudao.module.hshy.dal.dataobject.pointcongeal.PointCongealDO;
 import cn.iocoder.yudao.module.hshy.service.pointcongeal.PointCongealService;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 @Tag(name = "管理后台 - 用户积分金额冻结")
 @RestController

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/controller/admin/pointcongeal/vo/PointCongealSaveReqVO.java

@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.hshy.controller.admin.pointcongeal.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.*;
 
 

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/controller/admin/pointexchange/PointExchangeController.java

@@ -26,9 +26,9 @@ import cn.iocoder.yudao.module.hshy.controller.admin.pointexchange.vo.*;
 import cn.iocoder.yudao.module.hshy.dal.dataobject.pointexchange.PointExchangeDO;
 import cn.iocoder.yudao.module.hshy.service.pointexchange.PointExchangeService;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 @Tag(name = "管理后台 - 会员积分兑换")
 @RestController

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/controller/admin/pointexchange/vo/PointExchangeAuditReqVO.java

@@ -3,8 +3,8 @@ package cn.iocoder.yudao.module.hshy.controller.admin.pointexchange.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 会员积分兑换审核 Request VO")

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/controller/admin/pointexchange/vo/PointExchangeSaveReqVO.java

@@ -5,8 +5,8 @@ import lombok.*;
 import java.util.*;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
 @Schema(description = "管理后台 - 会员积分兑换新增/修改 Request VO")

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/controller/admin/pointrule/PointRuleController.java

@@ -24,9 +24,9 @@ import cn.iocoder.yudao.module.hshy.controller.admin.pointrule.vo.*;
 import cn.iocoder.yudao.module.hshy.dal.dataobject.pointrule.PointRuleDO;
 import cn.iocoder.yudao.module.hshy.service.pointrule.PointRuleService;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 @Tag(name = "管理后台 - 规则")
 @RestController

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/controller/admin/pointrule/vo/PointRuleSaveReqVO.java

@@ -3,8 +3,8 @@ package cn.iocoder.yudao.module.hshy.controller.admin.pointrule.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.*;
 import java.time.LocalDateTime;
 

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/controller/admin/pointruleitem/PointRuleItemController.java

@@ -26,9 +26,9 @@ import cn.iocoder.yudao.module.hshy.controller.admin.pointruleitem.vo.*;
 import cn.iocoder.yudao.module.hshy.dal.dataobject.pointruleitem.PointRuleItemDO;
 import cn.iocoder.yudao.module.hshy.service.pointruleitem.PointRuleItemService;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
+import  jakarta.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 @Tag(name = "管理后台 - 规则明细")
 @RestController

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/controller/admin/pointruleitem/vo/PointRuleItemSaveReqVO.java

@@ -4,8 +4,8 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 import java.util.*;
 
 @Schema(description = "管理后台 - 规则明细新增/修改 Request VO")

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/controller/admin/userblack/UserBlackController.java

@@ -26,8 +26,8 @@ import cn.iocoder.yudao.module.hshy.controller.admin.userblack.vo.*;
 import cn.iocoder.yudao.module.hshy.dal.dataobject.userblack.UserBlackDO;
 import cn.iocoder.yudao.module.hshy.service.userblack.UserBlackService;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 @Tag(name = "管理后台 - 会员黑名单")
 @RestController

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/controller/admin/userconfig/UserConfigBalanceController.java

@@ -12,8 +12,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/controller/admin/userconfig/UserConfigBonusController.java

@@ -12,8 +12,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/controller/admin/userconfig/UserConfigController.java

@@ -25,9 +25,9 @@ import cn.iocoder.yudao.module.hshy.controller.admin.userconfig.vo.*;
 import cn.iocoder.yudao.module.hshy.dal.dataobject.userconfig.UserConfigDO;
 import cn.iocoder.yudao.module.hshy.service.userconfig.UserConfigService;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
+import  jakarta.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 @Tag(name = "管理后台 - 会员条件配置")
 @RestController

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/controller/admin/userconfig/UserConfigCycleController.java

@@ -12,8 +12,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 @Tag(name = "管理后台 - 会员周期奖励")

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/controller/admin/userconfig/UserConfigDownController.java

@@ -12,8 +12,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/controller/admin/userconfig/UserConfigFreeController.java

@@ -12,8 +12,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/controller/admin/userconfig/UserConfigGradeController.java

@@ -13,8 +13,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/controller/admin/userconfig/UserConfigLevelController.java

@@ -12,8 +12,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/controller/admin/userconfig/UserConfigOnlyController.java

@@ -12,8 +12,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/controller/admin/userconfig/UserConfigPontsController.java

@@ -19,9 +19,9 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
+import  jakarta.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import java.io.IOException;
 import java.util.List;
 

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/controller/app/pointexchange/vo/AppPointExchangeController.java

@@ -26,9 +26,9 @@ import cn.iocoder.yudao.module.hshy.controller.admin.pointexchange.vo.*;
 import cn.iocoder.yudao.module.hshy.dal.dataobject.pointexchange.PointExchangeDO;
 import cn.iocoder.yudao.module.hshy.service.pointexchange.PointExchangeService;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
+import  jakarta.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 @Tag(name = "管理后台 - 会员积分兑换")
 @RestController

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/controller/app/userblack/AppUserBlackController.java

@@ -15,8 +15,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/service/extend/ExtendService.java

@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.hshy.service.extend;
 
 import java.util.*;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 import cn.iocoder.yudao.module.hshy.controller.admin.extend.vo.*;
 import cn.iocoder.yudao.module.hshy.dal.dataobject.extend.ExtendDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/service/extend/ExtendServiceImpl.java

@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.hshy.service.extend;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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;
 

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/service/pointcongeal/PointCongealService.java

@@ -6,7 +6,7 @@ import cn.iocoder.yudao.module.hshy.dal.dataobject.pointcongeal.PointCongealDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 /**
  * 用户积分金额冻结 Service 接口

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/service/pointcongeal/PointCongealServiceImpl.java

@@ -13,7 +13,7 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 
 import cn.iocoder.yudao.module.hshy.dal.mysql.pointcongeal.PointCongealMapper;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.hshy.enums.ErrorCodeConstants.*;

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/service/pointexchange/PointExchangeService.java

@@ -6,7 +6,7 @@ import cn.iocoder.yudao.module.hshy.dal.dataobject.pointexchange.PointExchangeDO
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 /**
  * 会员积分兑换 Service 接口

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/service/pointexchange/PointExchangeServiceImpl.java

@@ -16,7 +16,7 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 
 import cn.iocoder.yudao.module.hshy.dal.mysql.pointexchange.PointExchangeMapper;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.hshy.enums.ErrorCodeConstants.*;

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/service/pointrule/PointRuleService.java

@@ -6,7 +6,7 @@ import cn.iocoder.yudao.module.hshy.dal.dataobject.pointrule.PointRuleDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 /**
  * 规则 Service 接口

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/service/pointrule/PointRuleServiceImpl.java

@@ -13,7 +13,7 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 
 import cn.iocoder.yudao.module.hshy.dal.mysql.pointrule.PointRuleMapper;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.hshy.enums.ErrorCodeConstants.*;

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/service/pointruleitem/PointRuleItemService.java

@@ -5,8 +5,8 @@ import cn.iocoder.yudao.module.hshy.controller.admin.pointruleitem.vo.*;
 import cn.iocoder.yudao.module.hshy.dal.dataobject.pointruleitem.PointRuleItemDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import jakarta.validation.Valid;
 
-import javax.validation.Valid;
 
 /**
  * 规则明细 Service 接口

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/service/pointruleitem/PointRuleItemServiceImpl.java

@@ -16,7 +16,7 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 
 import cn.iocoder.yudao.module.hshy.dal.mysql.pointruleitem.PointRuleItemMapper;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.hshy.enums.ErrorCodeConstants.*;

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/service/userblack/UserBlackService.java

@@ -6,7 +6,7 @@ import cn.iocoder.yudao.module.hshy.dal.dataobject.userblack.UserBlackDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 /**
  * 会员黑名单 Service 接口

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/service/userblack/UserBlackServiceImpl.java

@@ -9,7 +9,7 @@ import cn.iocoder.yudao.module.hshy.dal.dataobject.userblack.UserBlackDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.hshy.dal.mysql.userblack.UserBlackMapper;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.hshy.enums.ErrorCodeConstants.*;
 

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/service/userconfig/UserConfigService.java

@@ -6,7 +6,7 @@ import cn.iocoder.yudao.module.hshy.dal.dataobject.userconfig.UserConfigDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 /**
  * 会员条件配置 Service 接口

yudao-module-mall/yudao-module-hshy-biz/src/main/java/cn/iocoder/yudao/module/hshy/service/userconfig/UserConfigServiceImpl.java

@@ -13,7 +13,7 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 
 import cn.iocoder.yudao.module.hshy.dal.mysql.userconfig.UserConfigMapper;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.hshy.enums.ErrorCodeConstants.*;