diff --git a/pom.xml b/pom.xml
index 6b92015f..9737d761 100644
--- a/pom.xml
+++ b/pom.xml
@@ -170,13 +170,6 @@
import
-
-
- de.codecentric
- spring-boot-admin-starter-client
- ${spring-boot-admin.version}
-
-
com.github.tobato
diff --git a/ruoyi-api/ruoyi-api-file/src/main/java/com/ruoyi/file/api/domain/SysFile.java b/ruoyi-api/ruoyi-api-file/src/main/java/com/ruoyi/file/api/domain/SysFile.java
index 072aff6c..c8c0d3ba 100644
--- a/ruoyi-api/ruoyi-api-file/src/main/java/com/ruoyi/file/api/domain/SysFile.java
+++ b/ruoyi-api/ruoyi-api-file/src/main/java/com/ruoyi/file/api/domain/SysFile.java
@@ -1,8 +1,6 @@
package com.ruoyi.file.api.domain;
import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
import java.io.Serializable;
@@ -12,8 +10,6 @@ import java.io.Serializable;
* @author ruoyi
*/
@Data
-@NoArgsConstructor
-@Accessors(chain = true)
public class SysFile implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java
index 17051514..ad375b43 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java
@@ -20,7 +20,6 @@ import javax.validation.constraints.Size;
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@ApiModel("部门业务对象")
public class SysDept extends TreeEntity {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java
index aa9dbaee..1be41371 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java
@@ -10,7 +10,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
@@ -23,7 +22,6 @@ import javax.validation.constraints.Size;
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@ExcelIgnoreUnannotated
@ApiModel("字典数据业务对象")
public class SysDictData extends BaseEntity {
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java
index a0065eb5..bd2529e2 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java
@@ -22,7 +22,6 @@ import javax.validation.constraints.Size;
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@ExcelIgnoreUnannotated
@ApiModel("字典类型业务对象")
public class SysDictType extends BaseEntity {
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java
index d2e10f16..213d6787 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java
@@ -21,7 +21,6 @@ import java.util.Map;
*/
@Data
-@Accessors(chain = true)
@ExcelIgnoreUnannotated
@ApiModel("系统访问记录业务对象")
public class SysLogininfor implements Serializable {
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java
index ac719a57..1c092348 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java
@@ -21,7 +21,6 @@ import java.util.Map;
*/
@Data
-@Accessors(chain = true)
@ExcelIgnoreUnannotated
@ApiModel("操作日志记录业务对象")
public class SysOperLog implements Serializable {
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java
index a8ea0405..d918e6bb 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java
@@ -23,7 +23,6 @@ import javax.validation.constraints.Size;
@Data
@NoArgsConstructor
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@ExcelIgnoreUnannotated
public class SysRole extends BaseEntity {
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
index d1587ef7..9599a3d2 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
@@ -26,7 +26,6 @@ import java.util.List;
@Data
@NoArgsConstructor
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@ApiModel("用户信息业务对象")
public class SysUser extends BaseEntity {
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java
index 85e1183a..e43ca19b 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java
@@ -1,67 +1,66 @@
-package com.ruoyi.system.api.model;
-
-import com.ruoyi.system.api.domain.SysUser;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.util.Set;
-
-/**
- * 用户信息
- *
- * @author ruoyi
- */
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-public class LoginUser implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**
- * 用户唯一标识
- */
- private String token;
-
- /**
- * 用户名id
- */
- private Long userid;
-
- /**
- * 用户名
- */
- private String username;
-
- /**
- * 登录时间
- */
- private Long loginTime;
-
- /**
- * 过期时间
- */
- private Long expireTime;
-
- /**
- * 登录IP地址
- */
- private String ipaddr;
-
- /**
- * 权限列表
- */
- private Set permissions;
-
- /**
- * 角色列表
- */
- private Set roles;
-
- /**
- * 用户信息
- */
- private SysUser sysUser;
-
-}
+package com.ruoyi.system.api.model;
+
+import com.ruoyi.system.api.domain.SysUser;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Set;
+
+/**
+ * 用户信息
+ *
+ * @author ruoyi
+ */
+@Data
+@NoArgsConstructor
+public class LoginUser implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 用户唯一标识
+ */
+ private String token;
+
+ /**
+ * 用户名id
+ */
+ private Long userid;
+
+ /**
+ * 用户名
+ */
+ private String username;
+
+ /**
+ * 登录时间
+ */
+ private Long loginTime;
+
+ /**
+ * 过期时间
+ */
+ private Long expireTime;
+
+ /**
+ * 登录IP地址
+ */
+ private String ipaddr;
+
+ /**
+ * 权限列表
+ */
+ private Set permissions;
+
+ /**
+ * 角色列表
+ */
+ private Set roles;
+
+ /**
+ * 用户信息
+ */
+ private SysUser sysUser;
+
+}
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java
index b4df9e2c..e20a3049 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java
@@ -11,7 +11,6 @@ import lombok.experimental.Accessors;
*/
@Data
@NoArgsConstructor
-@Accessors(chain = true)
public class LoginBody {
/**
diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml
index a436fd9d..4f568cc3 100644
--- a/ruoyi-common/ruoyi-common-core/pom.xml
+++ b/ruoyi-common/ruoyi-common-core/pom.xml
@@ -17,18 +17,6 @@
-
-
-
-
-
-
-
-
- org.springframework.cloud
- spring-cloud-starter-loadbalancer
-
-
org.springframework
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java
index c29d2dbb..96aa724a 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java
@@ -1,73 +1,75 @@
-package com.ruoyi.common.core.domain;
-
-import com.ruoyi.common.core.constant.Constants;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * 响应信息主体
- *
- * @author ruoyi
- */
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-public class R implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**
- * 成功
- */
- public static final int SUCCESS = Constants.SUCCESS;
-
- /**
- * 失败
- */
- public static final int FAIL = Constants.FAIL;
-
- private int code;
-
- private String msg;
-
- private T data;
-
- public static R ok() {
- return restResult(null, SUCCESS, null);
- }
-
- public static R ok(T data) {
- return restResult(data, SUCCESS, null);
- }
-
- public static R ok(T data, String msg) {
- return restResult(data, SUCCESS, msg);
- }
-
- public static R fail() {
- return restResult(null, FAIL, null);
- }
-
- public static R fail(String msg) {
- return restResult(null, FAIL, msg);
- }
-
- public static R fail(T data) {
- return restResult(data, FAIL, null);
- }
-
- public static R fail(T data, String msg) {
- return restResult(data, FAIL, msg);
- }
-
- public static R fail(int code, String msg) {
- return restResult(null, code, msg);
- }
-
- private static R restResult(T data, int code, String msg) {
- return new R().setCode(code).setData(data).setMsg(msg);
- }
-
-}
+package com.ruoyi.common.core.domain;
+
+import com.ruoyi.common.core.constant.Constants;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 响应信息主体
+ *
+ * @author ruoyi
+ */
+@Data
+@NoArgsConstructor
+public class R implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 成功
+ */
+ public static final int SUCCESS = Constants.SUCCESS;
+
+ /**
+ * 失败
+ */
+ public static final int FAIL = Constants.FAIL;
+
+ private int code;
+
+ private String msg;
+
+ private T data;
+
+ public static R ok() {
+ return restResult(null, SUCCESS, null);
+ }
+
+ public static R ok(T data) {
+ return restResult(data, SUCCESS, null);
+ }
+
+ public static R ok(T data, String msg) {
+ return restResult(data, SUCCESS, msg);
+ }
+
+ public static R fail() {
+ return restResult(null, FAIL, null);
+ }
+
+ public static R fail(String msg) {
+ return restResult(null, FAIL, msg);
+ }
+
+ public static R fail(T data) {
+ return restResult(data, FAIL, null);
+ }
+
+ public static R fail(T data, String msg) {
+ return restResult(data, FAIL, msg);
+ }
+
+ public static R fail(int code, String msg) {
+ return restResult(null, code, msg);
+ }
+
+ private static R restResult(T data, int code, String msg) {
+ R r = new R<>();
+ r.setCode(code);
+ r.setData(data);
+ r.setMsg(msg);
+ return r;
+ }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java
index d781afe8..d4b65b94 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java
@@ -16,7 +16,6 @@ import java.util.Map;
*/
@Data
-@Accessors(chain = true)
public class BaseEntity implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java
index 7ea8e2bb..a0d887a0 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java
@@ -16,7 +16,6 @@ import java.util.List;
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
public class TreeEntity extends BaseEntity {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/properties/SwaggerProperties.java b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/properties/SwaggerProperties.java
index 12685518..12cf880c 100644
--- a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/properties/SwaggerProperties.java
+++ b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/properties/SwaggerProperties.java
@@ -84,7 +84,6 @@ public class SwaggerProperties {
@Data
@NoArgsConstructor
- @Accessors(chain = true)
public static class Contact {
/**
@@ -104,7 +103,6 @@ public class SwaggerProperties {
@Data
@NoArgsConstructor
- @Accessors(chain = true)
public static class Authorization {
/**
@@ -128,7 +126,6 @@ public class SwaggerProperties {
@Data
@NoArgsConstructor
- @Accessors(chain = true)
public static class AuthorizationScope {
/**
diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java
index 787d9266..3552a845 100644
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java
@@ -1,30 +1,29 @@
-package com.ruoyi.gateway.config.properties;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.context.annotation.Configuration;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 放行白名单配置
- *
- * @author ruoyi
- */
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-@Configuration
-@RefreshScope
-@ConfigurationProperties(prefix = "security.ignore")
-public class IgnoreWhiteProperties {
- /**
- * 放行白名单配置，网关不校验此处的白名单
- */
- private List whites = new ArrayList<>();
-
-}
+package com.ruoyi.gateway.config.properties;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 放行白名单配置
+ *
+ * @author ruoyi
+ */
+@Data
+@NoArgsConstructor
+@Configuration
+@RefreshScope
+@ConfigurationProperties(prefix = "security.ignore")
+public class IgnoreWhiteProperties {
+ /**
+ * 放行白名单配置，网关不校验此处的白名单
+ */
+ private List whites = new ArrayList<>();
+
+}
diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java
index 81a3f734..9432c1c6 100644
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java
@@ -1,47 +1,46 @@
-package com.ruoyi.file.config;
-
-import io.minio.MinioClient;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * Minio 配置信息
- *
- * @author ruoyi
- */
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-@Configuration
-@ConfigurationProperties(prefix = "minio")
-public class MinioConfig {
-
- /**
- * 服务地址
- */
- private String url;
-
- /**
- * 用户名
- */
- private String accessKey;
-
- /**
- * 密码
- */
- private String secretKey;
-
- /**
- * 存储桶名称
- */
- private String bucketName;
-
- @Bean
- public MinioClient getMinioClient() {
- return MinioClient.builder().endpoint(url).credentials(accessKey, secretKey).build();
- }
-}
+package com.ruoyi.file.config;
+
+import io.minio.MinioClient;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Minio 配置信息
+ *
+ * @author ruoyi
+ */
+@Data
+@NoArgsConstructor
+@Configuration
+@ConfigurationProperties(prefix = "minio")
+public class MinioConfig {
+
+ /**
+ * 服务地址
+ */
+ private String url;
+
+ /**
+ * 用户名
+ */
+ private String accessKey;
+
+ /**
+ * 密码
+ */
+ private String secretKey;
+
+ /**
+ * 存储桶名称
+ */
+ private String bucketName;
+
+ @Bean
+ public MinioClient getMinioClient() {
+ return MinioClient.builder().endpoint(url).credentials(accessKey, secretKey).build();
+ }
+}
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java
index faaabf6f..d5069400 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java
@@ -1,186 +1,185 @@
-package com.ruoyi.gen.domain;
-
-import com.ruoyi.common.core.constant.GenConstants;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-import org.apache.commons.lang3.ArrayUtils;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-import java.util.List;
-
-/**
- * 业务表 gen_table
- *
- * @author ruoyi
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@Accessors(chain = true)
-public class GenTable extends BaseEntity {
-
- /**
- * 编号
- */
- private Long tableId;
-
- /**
- * 表名称
- */
- @NotBlank(message = "表名称不能为空")
- private String tableName;
-
- /**
- * 表描述
- */
- @NotBlank(message = "表描述不能为空")
- private String tableComment;
-
- /**
- * 关联父表的表名
- */
- private String subTableName;
-
- /**
- * 本表关联父表的外键名
- */
- private String subTableFkName;
-
- /**
- * 实体类名称(首字母大写)
- */
- @NotBlank(message = "实体类名称不能为空")
- private String className;
-
- /**
- * 使用的模板（crud单表操作 tree树表操作 sub主子表操作）
- */
- private String tplCategory;
-
- /**
- * 生成包路径
- */
- @NotBlank(message = "生成包路径不能为空")
- private String packageName;
-
- /**
- * 生成模块名
- */
- @NotBlank(message = "生成模块名不能为空")
- private String moduleName;
-
- /**
- * 生成业务名
- */
- @NotBlank(message = "生成业务名不能为空")
- private String businessName;
-
- /**
- * 生成功能名
- */
- @NotBlank(message = "生成功能名不能为空")
- private String functionName;
-
- /**
- * 生成作者
- */
- @NotBlank(message = "作者不能为空")
- private String functionAuthor;
-
- /**
- * 生成代码方式（0zip压缩包 1自定义路径）
- */
- private String genType;
-
- /**
- * 生成路径（不填默认项目路径）
- */
- private String genPath;
-
- /**
- * 主键信息
- */
- private GenTableColumn pkColumn;
-
- /**
- * 子表信息
- */
- private GenTable subTable;
-
- /**
- * 表列信息
- */
- @Valid
- private List columns;
-
- /**
- * 其它生成选项
- */
- private String options;
-
- /**
- * 树编码字段
- */
- private String treeCode;
-
- /**
- * 树父编码字段
- */
- private String treeParentCode;
-
- /**
- * 树名称字段
- */
- private String treeName;
-
- /**
- * 上级菜单ID字段
- */
- private String parentMenuId;
-
- /**
- * 上级菜单名称字段
- */
- private String parentMenuName;
-
- public boolean isSub() {
- return isSub(this.tplCategory);
- }
-
- public static boolean isSub(String tplCategory) {
- return tplCategory != null && StringUtils.equals(GenConstants.TPL_SUB, tplCategory);
- }
-
- public boolean isTree() {
- return isTree(this.tplCategory);
- }
-
- public static boolean isTree(String tplCategory) {
- return tplCategory != null && StringUtils.equals(GenConstants.TPL_TREE, tplCategory);
- }
-
- public boolean isCrud() {
- return isCrud(this.tplCategory);
- }
-
- public static boolean isCrud(String tplCategory) {
- return tplCategory != null && StringUtils.equals(GenConstants.TPL_CRUD, tplCategory);
- }
-
- public boolean isSuperColumn(String javaField) {
- return isSuperColumn(this.tplCategory, javaField);
- }
-
- public static boolean isSuperColumn(String tplCategory, String javaField) {
- if (isTree(tplCategory)) {
- return StringUtils.equalsAnyIgnoreCase(javaField,
- ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY));
- }
- return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY);
- }
-}
+package com.ruoyi.gen.domain;
+
+import com.ruoyi.common.core.constant.GenConstants;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.apache.commons.lang3.ArrayUtils;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+/**
+ * 业务表 gen_table
+ *
+ * @author ruoyi
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+public class GenTable extends BaseEntity {
+
+ /**
+ * 编号
+ */
+ private Long tableId;
+
+ /**
+ * 表名称
+ */
+ @NotBlank(message = "表名称不能为空")
+ private String tableName;
+
+ /**
+ * 表描述
+ */
+ @NotBlank(message = "表描述不能为空")
+ private String tableComment;
+
+ /**
+ * 关联父表的表名
+ */
+ private String subTableName;
+
+ /**
+ * 本表关联父表的外键名
+ */
+ private String subTableFkName;
+
+ /**
+ * 实体类名称(首字母大写)
+ */
+ @NotBlank(message = "实体类名称不能为空")
+ private String className;
+
+ /**
+ * 使用的模板（crud单表操作 tree树表操作 sub主子表操作）
+ */
+ private String tplCategory;
+
+ /**
+ * 生成包路径
+ */
+ @NotBlank(message = "生成包路径不能为空")
+ private String packageName;
+
+ /**
+ * 生成模块名
+ */
+ @NotBlank(message = "生成模块名不能为空")
+ private String moduleName;
+
+ /**
+ * 生成业务名
+ */
+ @NotBlank(message = "生成业务名不能为空")
+ private String businessName;
+
+ /**
+ * 生成功能名
+ */
+ @NotBlank(message = "生成功能名不能为空")
+ private String functionName;
+
+ /**
+ * 生成作者
+ */
+ @NotBlank(message = "作者不能为空")
+ private String functionAuthor;
+
+ /**
+ * 生成代码方式（0zip压缩包 1自定义路径）
+ */
+ private String genType;
+
+ /**
+ * 生成路径（不填默认项目路径）
+ */
+ private String genPath;
+
+ /**
+ * 主键信息
+ */
+ private GenTableColumn pkColumn;
+
+ /**
+ * 子表信息
+ */
+ private GenTable subTable;
+
+ /**
+ * 表列信息
+ */
+ @Valid
+ private List columns;
+
+ /**
+ * 其它生成选项
+ */
+ private String options;
+
+ /**
+ * 树编码字段
+ */
+ private String treeCode;
+
+ /**
+ * 树父编码字段
+ */
+ private String treeParentCode;
+
+ /**
+ * 树名称字段
+ */
+ private String treeName;
+
+ /**
+ * 上级菜单ID字段
+ */
+ private String parentMenuId;
+
+ /**
+ * 上级菜单名称字段
+ */
+ private String parentMenuName;
+
+ public boolean isSub() {
+ return isSub(this.tplCategory);
+ }
+
+ public static boolean isSub(String tplCategory) {
+ return tplCategory != null && StringUtils.equals(GenConstants.TPL_SUB, tplCategory);
+ }
+
+ public boolean isTree() {
+ return isTree(this.tplCategory);
+ }
+
+ public static boolean isTree(String tplCategory) {
+ return tplCategory != null && StringUtils.equals(GenConstants.TPL_TREE, tplCategory);
+ }
+
+ public boolean isCrud() {
+ return isCrud(this.tplCategory);
+ }
+
+ public static boolean isCrud(String tplCategory) {
+ return tplCategory != null && StringUtils.equals(GenConstants.TPL_CRUD, tplCategory);
+ }
+
+ public boolean isSuperColumn(String javaField) {
+ return isSuperColumn(this.tplCategory, javaField);
+ }
+
+ public static boolean isSuperColumn(String tplCategory, String javaField) {
+ if (isTree(tplCategory)) {
+ return StringUtils.equalsAnyIgnoreCase(javaField,
+ ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY));
+ }
+ return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY);
+ }
+}
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java
index db0e6f40..2b92e4ee 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java
@@ -1,211 +1,210 @@
-package com.ruoyi.gen.domain;
-
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.web.domain.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-
-import javax.validation.constraints.NotBlank;
-
-/**
- * 代码生成业务字段表 gen_table_column
- *
- * @author ruoyi
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
-@Accessors(chain = true)
-public class GenTableColumn extends BaseEntity {
-
- /**
- * 编号
- */
- private Long columnId;
-
- /**
- * 归属表编号
- */
- private Long tableId;
-
- /**
- * 列名称
- */
- private String columnName;
-
- /**
- * 列描述
- */
- private String columnComment;
-
- /**
- * 列类型
- */
- private String columnType;
-
- /**
- * JAVA类型
- */
- private String javaType;
-
- /**
- * JAVA字段名
- */
- @NotBlank(message = "Java属性不能为空")
- private String javaField;
-
- /**
- * 是否主键（1是）
- */
- private String isPk;
-
- /**
- * 是否自增（1是）
- */
- private String isIncrement;
-
- /**
- * 是否必填（1是）
- */
- private String isRequired;
-
- /**
- * 是否为插入字段（1是）
- */
- private String isInsert;
-
- /**
- * 是否编辑字段（1是）
- */
- private String isEdit;
-
- /**
- * 是否列表字段（1是）
- */
- private String isList;
-
- /**
- * 是否查询字段（1是）
- */
- private String isQuery;
-
- /**
- * 查询方式（EQ等于、NE不等于、GT大于、LT小于、LIKE模糊、BETWEEN范围）
- */
- private String queryType;
-
- /**
- * 显示类型（input文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件、image图片上传控件、upload文件上传控件、editor富文本控件）
- */
- private String htmlType;
-
- /**
- * 字典类型
- */
- private String dictType;
-
- /**
- * 排序
- */
- private Integer sort;
-
- public String getCapJavaField() {
- return StringUtils.capitalize(javaField);
- }
-
- public boolean isPk() {
- return isPk(this.isPk);
- }
-
- public boolean isPk(String isPk) {
- return isPk != null && StringUtils.equals("1", isPk);
- }
-
- public boolean isIncrement() {
- return isIncrement(this.isIncrement);
- }
-
- public boolean isIncrement(String isIncrement) {
- return isIncrement != null && StringUtils.equals("1", isIncrement);
- }
-
- public boolean isRequired() {
- return isRequired(this.isRequired);
- }
-
- public boolean isRequired(String isRequired) {
- return isRequired != null && StringUtils.equals("1", isRequired);
- }
-
- public boolean isInsert() {
- return isInsert(this.isInsert);
- }
-
- public boolean isInsert(String isInsert) {
- return isInsert != null && StringUtils.equals("1", isInsert);
- }
-
- public boolean isEdit() {
- return isInsert(this.isEdit);
- }
-
- public boolean isEdit(String isEdit) {
- return isEdit != null && StringUtils.equals("1", isEdit);
- }
-
- public boolean isList() {
- return isList(this.isList);
- }
-
- public boolean isList(String isList) {
- return isList != null && StringUtils.equals("1", isList);
- }
-
- public boolean isQuery() {
- return isQuery(this.isQuery);
- }
-
- public boolean isQuery(String isQuery) {
- return isQuery != null && StringUtils.equals("1", isQuery);
- }
-
- public boolean isSuperColumn() {
- return isSuperColumn(this.javaField);
- }
-
- public static boolean isSuperColumn(String javaField) {
- return StringUtils.equalsAnyIgnoreCase(javaField,
- // BaseEntity
- "createBy", "createTime", "updateBy", "updateTime", "remark",
- // TreeEntity
- "parentName", "parentId", "orderNum", "ancestors");
- }
-
- public boolean isUsableColumn() {
- return isUsableColumn(javaField);
- }
-
- public static boolean isUsableColumn(String javaField) {
- // isSuperColumn()中的名单用于避免生成多余Domain属性，若某些属性在生成页面时需要用到不能忽略，则放在此处白名单
- return StringUtils.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark");
- }
-
- public String readConverterExp() {
- String remarks = StringUtils.substringBetween(this.columnComment, "（", "）");
- StringBuffer sb = new StringBuffer();
- if (StringUtils.isNotEmpty(remarks)) {
- for (String value : remarks.split(" ")) {
- if (StringUtils.isNotEmpty(value)) {
- Object startStr = value.subSequence(0, 1);
- String endStr = value.substring(1);
- sb.append("").append(startStr).append("=").append(endStr).append(",");
- }
- }
- return sb.deleteCharAt(sb.length() - 1).toString();
- } else {
- return this.columnComment;
- }
- }
-}
\ No newline at end of file
+package com.ruoyi.gen.domain;
+
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 代码生成业务字段表 gen_table_column
+ *
+ * @author ruoyi
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+public class GenTableColumn extends BaseEntity {
+
+ /**
+ * 编号
+ */
+ private Long columnId;
+
+ /**
+ * 归属表编号
+ */
+ private Long tableId;
+
+ /**
+ * 列名称
+ */
+ private String columnName;
+
+ /**
+ * 列描述
+ */
+ private String columnComment;
+
+ /**
+ * 列类型
+ */
+ private String columnType;
+
+ /**
+ * JAVA类型
+ */
+ private String javaType;
+
+ /**
+ * JAVA字段名
+ */
+ @NotBlank(message = "Java属性不能为空")
+ private String javaField;
+
+ /**
+ * 是否主键（1是）
+ */
+ private String isPk;
+
+ /**
+ * 是否自增（1是）
+ */
+ private String isIncrement;
+
+ /**
+ * 是否必填（1是）
+ */
+ private String isRequired;
+
+ /**
+ * 是否为插入字段（1是）
+ */
+ private String isInsert;
+
+ /**
+ * 是否编辑字段（1是）
+ */
+ private String isEdit;
+
+ /**
+ * 是否列表字段（1是）
+ */
+ private String isList;
+
+ /**
+ * 是否查询字段（1是）
+ */
+ private String isQuery;
+
+ /**
+ * 查询方式（EQ等于、NE不等于、GT大于、LT小于、LIKE模糊、BETWEEN范围）
+ */
+ private String queryType;
+
+ /**
+ * 显示类型（input文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件、image图片上传控件、upload文件上传控件、editor富文本控件）
+ */
+ private String htmlType;
+
+ /**
+ * 字典类型
+ */
+ private String dictType;
+
+ /**
+ * 排序
+ */
+ private Integer sort;
+
+ public String getCapJavaField() {
+ return StringUtils.capitalize(javaField);
+ }
+
+ public boolean isPk() {
+ return isPk(this.isPk);
+ }
+
+ public boolean isPk(String isPk) {
+ return isPk != null && StringUtils.equals("1", isPk);
+ }
+
+ public boolean isIncrement() {
+ return isIncrement(this.isIncrement);
+ }
+
+ public boolean isIncrement(String isIncrement) {
+ return isIncrement != null && StringUtils.equals("1", isIncrement);
+ }
+
+ public boolean isRequired() {
+ return isRequired(this.isRequired);
+ }
+
+ public boolean isRequired(String isRequired) {
+ return isRequired != null && StringUtils.equals("1", isRequired);
+ }
+
+ public boolean isInsert() {
+ return isInsert(this.isInsert);
+ }
+
+ public boolean isInsert(String isInsert) {
+ return isInsert != null && StringUtils.equals("1", isInsert);
+ }
+
+ public boolean isEdit() {
+ return isInsert(this.isEdit);
+ }
+
+ public boolean isEdit(String isEdit) {
+ return isEdit != null && StringUtils.equals("1", isEdit);
+ }
+
+ public boolean isList() {
+ return isList(this.isList);
+ }
+
+ public boolean isList(String isList) {
+ return isList != null && StringUtils.equals("1", isList);
+ }
+
+ public boolean isQuery() {
+ return isQuery(this.isQuery);
+ }
+
+ public boolean isQuery(String isQuery) {
+ return isQuery != null && StringUtils.equals("1", isQuery);
+ }
+
+ public boolean isSuperColumn() {
+ return isSuperColumn(this.javaField);
+ }
+
+ public static boolean isSuperColumn(String javaField) {
+ return StringUtils.equalsAnyIgnoreCase(javaField,
+ // BaseEntity
+ "createBy", "createTime", "updateBy", "updateTime", "remark",
+ // TreeEntity
+ "parentName", "parentId", "orderNum", "ancestors");
+ }
+
+ public boolean isUsableColumn() {
+ return isUsableColumn(javaField);
+ }
+
+ public static boolean isUsableColumn(String javaField) {
+ // isSuperColumn()中的名单用于避免生成多余Domain属性，若某些属性在生成页面时需要用到不能忽略，则放在此处白名单
+ return StringUtils.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark");
+ }
+
+ public String readConverterExp() {
+ String remarks = StringUtils.substringBetween(this.columnComment, "（", "）");
+ StringBuffer sb = new StringBuffer();
+ if (StringUtils.isNotEmpty(remarks)) {
+ for (String value : remarks.split(" ")) {
+ if (StringUtils.isNotEmpty(value)) {
+ Object startStr = value.subSequence(0, 1);
+ String endStr = value.substring(1);
+ sb.append("").append(startStr).append("=").append(endStr).append(",");
+ }
+ }
+ return sb.deleteCharAt(sb.length() - 1).toString();
+ } else {
+ return this.columnComment;
+ }
+ }
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
index d594554c..64bd35bb 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
@@ -22,7 +22,6 @@ import javax.validation.constraints.Size;
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@ExcelIgnoreUnannotated
@ApiModel("参数配置业务对象")
public class SysConfig extends BaseEntity {
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java
index 514e6a58..11915cd1 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java
@@ -19,7 +19,6 @@ import javax.validation.constraints.Size;
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@ApiModel("菜单权限业务对象")
public class SysMenu extends TreeEntity {
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
index 18a03b1f..b459aed5 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
@@ -18,7 +18,6 @@ import javax.validation.constraints.Size;
*/
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
public class SysNotice extends BaseEntity {
/**
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
index 94e11a2a..1729bea4 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
@@ -22,7 +22,6 @@ import javax.validation.constraints.Size;
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@ExcelIgnoreUnannotated
@ApiModel("岗位信息业务对象")
public class SysPost extends BaseEntity {
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java
index 9203bbb1..fc159307 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java
@@ -12,7 +12,6 @@ import lombok.experimental.Accessors;
*/
@Data
-@Accessors(chain = true)
@ApiModel("角色和部门关联")
public class SysRoleDept {
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java
index da34f00d..907c944c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java
@@ -12,7 +12,6 @@ import lombok.experimental.Accessors;
*/
@Data
-@Accessors(chain = true)
@ApiModel("角色和菜单关联")
public class SysRoleMenu {
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java
index 656b4eef..713aec7b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java
@@ -1,67 +1,66 @@
-package com.ruoyi.system.domain;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * 当前在线会话
- *
- * @author Lion Li
- */
-
-@Data
-@Accessors(chain = true)
-@ApiModel("当前在线会话业务对象")
-public class SysUserOnline {
-
- /**
- * 会话编号
- */
- @ApiModelProperty(value = "会话编号")
- private String tokenId;
-
- /**
- * 部门名称
- */
- @ApiModelProperty(value = "部门名称")
- private String deptName;
-
- /**
- * 用户名称
- */
- @ApiModelProperty(value = "用户名称")
- private String userName;
-
- /**
- * 登录IP地址
- */
- @ApiModelProperty(value = "登录IP地址")
- private String ipaddr;
-
- /**
- * 登录地址
- */
- @ApiModelProperty(value = "登录地址")
- private String loginLocation;
-
- /**
- * 浏览器类型
- */
- @ApiModelProperty(value = "浏览器类型")
- private String browser;
-
- /**
- * 操作系统
- */
- @ApiModelProperty(value = "操作系统")
- private String os;
-
- /**
- * 登录时间
- */
- @ApiModelProperty(value = "登录时间")
- private Long loginTime;
-
-}
+package com.ruoyi.system.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 当前在线会话
+ *
+ * @author Lion Li
+ */
+
+@Data
+@ApiModel("当前在线会话业务对象")
+public class SysUserOnline {
+
+ /**
+ * 会话编号
+ */
+ @ApiModelProperty(value = "会话编号")
+ private String tokenId;
+
+ /**
+ * 部门名称
+ */
+ @ApiModelProperty(value = "部门名称")
+ private String deptName;
+
+ /**
+ * 用户名称
+ */
+ @ApiModelProperty(value = "用户名称")
+ private String userName;
+
+ /**
+ * 登录IP地址
+ */
+ @ApiModelProperty(value = "登录IP地址")
+ private String ipaddr;
+
+ /**
+ * 登录地址
+ */
+ @ApiModelProperty(value = "登录地址")
+ private String loginLocation;
+
+ /**
+ * 浏览器类型
+ */
+ @ApiModelProperty(value = "浏览器类型")
+ private String browser;
+
+ /**
+ * 操作系统
+ */
+ @ApiModelProperty(value = "操作系统")
+ private String os;
+
+ /**
+ * 登录时间
+ */
+ @ApiModelProperty(value = "登录时间")
+ private Long loginTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java
index a3dcbd07..40a5cd08 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java
@@ -12,7 +12,6 @@ import lombok.experimental.Accessors;
*/
@Data
-@Accessors(chain = true)
@ApiModel("用户和岗位关联")
public class SysUserPost {
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java
index c279adc3..ec42069b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java
@@ -12,7 +12,6 @@ import lombok.experimental.Accessors;
*/
@Data
-@Accessors(chain = true)
@ApiModel("用户和角色关联")
public class SysUserRole {
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
index 9c82de70..e758339c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
@@ -1,63 +1,62 @@
-package com.ruoyi.system.domain.vo;
-
-import com.ruoyi.common.core.utils.StringUtils;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-
-/**
- * 路由显示信息
- *
- * @author ruoyi
- */
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-public class MetaVo {
-
- /**
- * 设置该路由在侧边栏和面包屑中展示的名字
- */
- private String title;
-
- /**
- * 设置该路由的图标，对应路径src/assets/icons/svg
- */
- private String icon;
-
- /**
- * 设置为true，则不会被 缓存
- */
- private boolean noCache;
-
- /**
- * 内链地址（http(s)://开头）
- */
- private String link;
-
- public MetaVo(String title, String icon) {
- this.title = title;
- this.icon = icon;
- }
-
- public MetaVo(String title, String icon, boolean noCache) {
- this.title = title;
- this.icon = icon;
- this.noCache = noCache;
- }
-
- public MetaVo(String title, String icon, String link) {
- this.title = title;
- this.icon = icon;
- this.link = link;
- }
-
- public MetaVo(String title, String icon, boolean noCache, String link) {
- this.title = title;
- this.icon = icon;
- this.noCache = noCache;
- if (StringUtils.ishttp(link)) {
- this.link = link;
- }
- }
-}
+package com.ruoyi.system.domain.vo;
+
+import com.ruoyi.common.core.utils.StringUtils;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * 路由显示信息
+ *
+ * @author ruoyi
+ */
+@Data
+@NoArgsConstructor
+public class MetaVo {
+
+ /**
+ * 设置该路由在侧边栏和面包屑中展示的名字
+ */
+ private String title;
+
+ /**
+ * 设置该路由的图标，对应路径src/assets/icons/svg
+ */
+ private String icon;
+
+ /**
+ * 设置为true，则不会被 缓存
+ */
+ private boolean noCache;
+
+ /**
+ * 内链地址（http(s)://开头）
+ */
+ private String link;
+
+ public MetaVo(String title, String icon) {
+ this.title = title;
+ this.icon = icon;
+ }
+
+ public MetaVo(String title, String icon, boolean noCache) {
+ this.title = title;
+ this.icon = icon;
+ this.noCache = noCache;
+ }
+
+ public MetaVo(String title, String icon, String link) {
+ this.title = title;
+ this.icon = icon;
+ this.link = link;
+ }
+
+ public MetaVo(String title, String icon, boolean noCache, String link) {
+ this.title = title;
+ this.icon = icon;
+ this.noCache = noCache;
+ if (StringUtils.ishttp(link)) {
+ this.link = link;
+ }
+ }
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
index fb6d66fc..3e75d929 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
@@ -1,66 +1,65 @@
-package com.ruoyi.system.domain.vo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-
-import java.util.List;
-
-/**
- * 路由配置信息
- *
- * @author ruoyi
- */
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-@JsonInclude(JsonInclude.Include.NON_EMPTY)
-public class RouterVo {
-
- /**
- * 路由名字
- */
- private String name;
-
- /**
- * 路由地址
- */
- private String path;
-
- /**
- * 是否隐藏路由，当设置 true 的时候该路由不会再侧边栏出现
- */
- private boolean hidden;
-
- /**
- * 重定向地址，当设置 noRedirect 的时候该路由在面包屑导航中不可被点击
- */
- private String redirect;
-
- /**
- * 组件地址
- */
- private String component;
-
- /**
- * 路由参数：如 {"id": 1, "name": "ry"}
- */
- private String query;
-
- /**
- * 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面
- */
- private Boolean alwaysShow;
-
- /**
- * 其他元素
- */
- private MetaVo meta;
-
- /**
- * 子路由
- */
- private List children;
-
-}
+package com.ruoyi.system.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * 路由配置信息
+ *
+ * @author ruoyi
+ */
+@Data
+@NoArgsConstructor
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public class RouterVo {
+
+ /**
+ * 路由名字
+ */
+ private String name;
+
+ /**
+ * 路由地址
+ */
+ private String path;
+
+ /**
+ * 是否隐藏路由，当设置 true 的时候该路由不会再侧边栏出现
+ */
+ private boolean hidden;
+
+ /**
+ * 重定向地址，当设置 noRedirect 的时候该路由在面包屑导航中不可被点击
+ */
+ private String redirect;
+
+ /**
+ * 组件地址
+ */
+ private String component;
+
+ /**
+ * 路由参数：如 {"id": 1, "name": "ry"}
+ */
+ private String query;
+
+ /**
+ * 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面
+ */
+ private Boolean alwaysShow;
+
+ /**
+ * 其他元素
+ */
+ private MetaVo meta;
+
+ /**
+ * 子路由
+ */
+ private List children;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java
index 6a9f1df4..d0384de7 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java
@@ -18,7 +18,6 @@ import java.util.Date;
@Data
@NoArgsConstructor
-@Accessors(chain = true)
public class SysUserExportVo implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserImportVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserImportVo.java
index d77f3836..5843a8ab 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserImportVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserImportVo.java
@@ -16,7 +16,6 @@ import java.io.Serializable;
@Data
@NoArgsConstructor
-// @Accessors(chain = true) // 导入不允许使用 会找不到set方法
public class SysUserImportVo implements Serializable {
private static final long serialVersionUID = 1L;