Merge remote-tracking branch 'origin/master'

system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/admin/AdminBO.java

@@ -28,4 +28,7 @@ public class AdminBO implements Serializable {
     @ApiModelProperty(value = "创建时间", required = true, example = "时间戳格式")
     private Date createTime;
 
+    @ApiModelProperty(value = "部门ID", required = true, example = "1")
+    private Integer deptmentId;
+
 }

system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/admin/AdminAddDTO.java

@@ -7,6 +7,7 @@ import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 import java.io.Serializable;
 
@@ -31,4 +32,8 @@ public class AdminAddDTO implements Serializable {
     @Length(min = 4, max = 16, message = "密码长度为 4-16 位")
     private String password;
 
+    @ApiModelProperty(value = "部门ID", required = true, example = "1")
+    @NotNull(message = "部门不能为空")
+    private Integer deptmentId;
+
 }

system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/admin/AdminPageDTO.java

@@ -14,4 +14,8 @@ public class AdminPageDTO extends PageParam {
     @ApiModelProperty(value = "昵称，模糊匹配", example = "小王")
     private String nickname;
 
+
+    @ApiModelProperty(value = "所在部门ID")
+    private Integer deptmentId;
+
 }

system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/admin/AdminUpdateDTO.java

@@ -35,4 +35,8 @@ public class AdminUpdateDTO implements Serializable {
     @Length(min = 4, max = 16, message = "密码长度为 4-16 位")
     private String password;
 
+    @ApiModelProperty(value = "部门ID", required = true, example = "1")
+    @NotNull(message = "部门不能为空")
+    private Integer deptmentId;
+
 }