Merge remote-tracking branch 'origin/master'

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<UserDO> {
      * @return
      */
     default IPage<UserDO> selectUserPage(UserPageDTO userPageDTO) {
+        // TODO FROM 芋艿 to jwf1173：看下 QueryWrapperX 噢，已经提供判空啦
         return this.selectPage(new Page<>(userPageDTO.getPageNo(), userPageDTO.getPageSize()),
                 Wrappers.<UserDO>query().lambda()
                 .eq(StringUtils.isNotBlank(userPageDTO.getNickname()), UserDO::getNickname, userPageDTO.getNickname())

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;