From 4df4f822bc6540b03608bcb4b9c9c932bd8e85c7 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 22 Mar 2024 14:40:40 +0800
Subject: [PATCH] format code

---
 .../jeesite/modules/sys/entity/EmpUser.java   | 42 +++++++++----------
 .../jeesite/modules/sys/entity/PostRole.java  |  8 ++--
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java
index 716890c9..ad632653 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java
@@ -45,35 +45,35 @@ import jakarta.validation.Valid;
 		@JoinTable(type=Type.LEFT_JOIN, entity=Office.class, alias="o", 
 			on="o.office_code=e.office_code", attrName="employee.office",
 			columns={
-					@Column(includeEntity=DataEntity.class),
-					@Column(includeEntity=TreeEntity.class),
-					@Column(name="office_code", label="机构编码", isPK=true),
-					@Column(name="view_code", 	label="机构代码"),
-					@Column(name="office_name", label="机构名称", isQuery=false),
-					@Column(name="full_name", 	label="机构全称"),
-					@Column(name="office_type", label="机构类型"),
-					@Column(name="leader", 		label="负责人"),
-					@Column(name="phone", 		label="电话"),
-					@Column(name="address", 	label="联系地址"),
-					@Column(name="zip_code", 	label="邮政编码"),
-					@Column(name="email", 		label="邮箱"),
+				@Column(includeEntity=DataEntity.class),
+				@Column(includeEntity=TreeEntity.class),
+				@Column(name="office_code", label="机构编码", isPK=true),
+				@Column(name="view_code", 	label="机构代码"),
+				@Column(name="office_name", label="机构名称", isQuery=false),
+				@Column(name="full_name", 	label="机构全称"),
+				@Column(name="office_type", label="机构类型"),
+				@Column(name="leader", 		label="负责人"),
+				@Column(name="phone", 		label="电话"),
+				@Column(name="address", 	label="联系地址"),
+				@Column(name="zip_code", 	label="邮政编码"),
+				@Column(name="email", 		label="邮箱"),
 		}),
 		@JoinTable(type=Type.LEFT_JOIN, entity=Company.class, alias="c", 
 			on="c.company_code=e.company_code", attrName="employee.company",
 			columns={
-					@Column(includeEntity=DataEntity.class),
-					@Column(includeEntity=TreeEntity.class),
-					@Column(name="company_code", label="公司编码", isPK=true),
-					@Column(name="view_code", 	label="公司代码"),
-					@Column(name="company_name", label="公司名称", isQuery=false),
-					@Column(name="full_name", 	label="公司全称"),
+				@Column(includeEntity=DataEntity.class),
+				@Column(includeEntity=TreeEntity.class),
+				@Column(name="company_code", label="公司编码", isPK=true),
+				@Column(name="view_code", 	label="公司代码"),
+				@Column(name="company_name", label="公司名称", isQuery=false),
+				@Column(name="full_name", 	label="公司全称"),
 		}),
 		@JoinTable(type=Type.LEFT_JOIN, entity=Area.class, alias="ar",
 			on="ar.area_code = c.area_code", attrName="employee.company.area",
 			columns={
-					@Column(name="area_code", 	label="区域代码", isPK=true),
-					@Column(name="area_name", 	label="区域名称", isQuery=false),
-					@Column(name="area_type", 	label="区域类型"),
+				@Column(name="area_code", 	label="区域代码", isPK=true),
+				@Column(name="area_name", 	label="区域名称", isQuery=false),
+				@Column(name="area_type", 	label="区域类型"),
 		}),
 //		@JoinTable(type=Type.LEFT_JOIN, entity=User.class, attrName="this", alias="u",
 //			on="u.user_code = a.create_by", columns={
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/PostRole.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/PostRole.java
index 74ea21fa..94f5c3e4 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/PostRole.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/PostRole.java
@@ -18,12 +18,12 @@ import com.jeesite.common.mybatis.annotation.Table;
 		@Column(name="role_code", attrName="roleCode", label="角色编码", isPK=true),
 		@Column(name="post_code", attrName="postCode", label="岗位编码", isPK=true),
 	},
-	joinTable = {
+	joinTable={
 		@JoinTable(type=JoinTable.Type.LEFT_JOIN, entity=Role.class, alias="r", lazy = true,
 			on="a.role_code = r.role_code", attrName="role",
 			columns={
-				@Column(name="role_code", 	attrName="roleCode", 	label="角色编码", isPK=true),
-				@Column(name="role_name", 	attrName="roleName", 	label="角色名称"),
+				@Column(name="role_code", attrName="roleCode", label="角色编码", isPK=true),
+				@Column(name="role_name", attrName="roleName", label="角色名称"),
 			})
 	}, orderBy=""
 )
@@ -33,7 +33,7 @@ public class PostRole extends DataEntity<PostRole> {
 	private String postCode;	// 岗位编码
 	private String roleCode;	// 角色编码
 
-	private Role role; // sqlMap().loadJoinTableAlias("r")的时候返回数据
+	private Role role; // sqlMap().loadJoinTableAlias("r") 的时候返回数据
 
 	public PostRole() {
 		this(null, null);