diff --git a/order/order-biz/src/main/java/cn/iocoder/mall/order/biz/dto/order/OrderCreateDTO.java b/order/order-biz/src/main/java/cn/iocoder/mall/order/biz/dto/order/OrderCreateDTO.java index 543b09f0f..b9145d2ae 100644 --- a/order/order-biz/src/main/java/cn/iocoder/mall/order/biz/dto/order/OrderCreateDTO.java +++ b/order/order-biz/src/main/java/cn/iocoder/mall/order/biz/dto/order/OrderCreateDTO.java @@ -16,6 +16,7 @@ import java.util.List; */ @Data @Accessors(chain = true) +// TODO FROM 芋艿 to xiaofeng:辛苦后续补充下 Validation 注解哈 public class OrderCreateDTO implements Serializable { /** diff --git a/order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/OrderPageRequest.java b/order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/OrderPageRequest.java index 580029ec1..412e446a5 100644 --- a/order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/OrderPageRequest.java +++ b/order/order-rest/src/main/java/cn/iocoder/mall/order/rest/request/admin/OrderPageRequest.java @@ -3,11 +3,12 @@ package cn.iocoder.mall.order.rest.request.admin; import cn.iocoder.mall.order.biz.bo.order.OrderBO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; -import java.util.List; import lombok.Data; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.List; + /** * 订单分页 vo * @@ -17,6 +18,7 @@ import lombok.experimental.Accessors; @Data @Accessors(chain = true) @ApiModel("订单VO") +// TODO FROM 芋艿 to jwf1173:命名要改下,rest 以 Admins 和 Users 开头 public class OrderPageRequest implements Serializable { /** diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/user/UserMapper.java b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/user/UserMapper.java index 90e571d45..1968f0e7a 100644 --- a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/user/UserMapper.java +++ b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dao/user/UserMapper.java @@ -2,7 +2,6 @@ package cn.iocoder.mall.system.biz.dao.user; import cn.iocoder.mall.system.biz.dataobject.user.UserDO; import cn.iocoder.mall.system.biz.dto.user.UserPageDTO; -import cn.iocoder.mall.system.biz.dto.user.UserUpdateDTO; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -26,6 +25,7 @@ public interface UserMapper extends BaseMapper { * @return */ default IPage selectUserPage(UserPageDTO userPageDTO) { + // TODO FROM 芋艿 to jwf1173:看下 QueryWrapperX 噢,已经提供判空啦 return this.selectPage(new Page<>(userPageDTO.getPageNo(), userPageDTO.getPageSize()), Wrappers.query().lambda() .eq(StringUtils.isNotBlank(userPageDTO.getNickname()), UserDO::getNickname, userPageDTO.getNickname()) diff --git a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/authorization/RoleDO.java b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/authorization/RoleDO.java index 46354c2de..f6b8611a0 100644 --- a/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/authorization/RoleDO.java +++ b/system/system-biz/src/main/java/cn/iocoder/mall/system/biz/dataobject/authorization/RoleDO.java @@ -1,6 +1,8 @@ package cn.iocoder.mall.system.biz.dataobject.authorization; import cn.iocoder.mall.mybatis.dataobject.DeletableDO; +import cn.iocoder.mall.system.biz.enums.authorization.RoleCodeEnum; +import cn.iocoder.mall.system.biz.enums.authorization.RoleTypeEnum; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -25,10 +27,14 @@ public class RoleDO extends DeletableDO { private String name; /** * 角色编码 + * + * 关联 {@link RoleCodeEnum} */ private String code; /** * 角色类型 + * + * 关联 {@link RoleTypeEnum} */ private Integer type;