Merge branch 'liweidong'

blade-service-api/blade-user-api/src/main/java/org/springblade/system/pojo/entity/User.java

@@ -115,9 +115,4 @@ public class User extends TenantEntity {
 	 */
 	private Integer isLeader;
 
-	/**
-	 * 拼接字段
-	 */
-	private String codeRealName;
-
 }

blade-service-api/blade-user-api/src/main/java/org/springblade/system/pojo/vo/UserVO.java

@@ -98,4 +98,9 @@ public class UserVO extends User {
 	 * 工号
 	 */
 	private String workNo;
+
+	/**
+	 * 拼接字段
+	 */
+	private String codeRealName;
 }