diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 0000000..2b63946
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/four-api-system/src/main/java/com/four/system/api/domain/SysRole.java b/four-api-system/src/main/java/com/four/system/api/domain/SysRole.java
index 491a2f7..b49c271 100644
--- a/four-api-system/src/main/java/com/four/system/api/domain/SysRole.java
+++ b/four-api-system/src/main/java/com/four/system/api/domain/SysRole.java
@@ -1,5 +1,6 @@
package com.four.system.api.domain;
+import java.util.Arrays;
import java.util.Set;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@@ -12,7 +13,7 @@ import com.four.common.core.web.domain.BaseEntity;
/**
* 角色表 sys_role
- *
+ *
* @author ruoyi
*/
public class SysRole extends BaseEntity
@@ -69,6 +70,25 @@ public class SysRole extends BaseEntity
}
+ @Override
+ public String toString() {
+ return "SysRole{" +
+ "roleId=" + roleId +
+ ", roleName='" + roleName + '\'' +
+ ", roleKey='" + roleKey + '\'' +
+ ", roleSort=" + roleSort +
+ ", dataScope='" + dataScope + '\'' +
+ ", menuCheckStrictly=" + menuCheckStrictly +
+ ", deptCheckStrictly=" + deptCheckStrictly +
+ ", status='" + status + '\'' +
+ ", delFlag='" + delFlag + '\'' +
+ ", flag=" + flag +
+ ", menuIds=" + Arrays.toString(menuIds) +
+ ", deptIds=" + Arrays.toString(deptIds) +
+ ", permissions=" + permissions +
+ '}';
+ }
+
public SysRole(Long roleId)
{
this.roleId = roleId;
@@ -219,23 +239,4 @@ public class SysRole extends BaseEntity
this.permissions = permissions;
}
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("roleId", getRoleId())
- .append("roleName", getRoleName())
- .append("roleKey", getRoleKey())
- .append("roleSort", getRoleSort())
- .append("dataScope", getDataScope())
- .append("menuCheckStrictly", isMenuCheckStrictly())
- .append("deptCheckStrictly", isDeptCheckStrictly())
- .append("status", getStatus())
- .append("delFlag", getDelFlag())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .append("remark", getRemark())
- .toString();
- }
}
diff --git a/four-api-system/src/main/java/com/four/system/api/domain/SysUser.java b/four-api-system/src/main/java/com/four/system/api/domain/SysUser.java
index 45ba2e2..831f662 100644
--- a/four-api-system/src/main/java/com/four/system/api/domain/SysUser.java
+++ b/four-api-system/src/main/java/com/four/system/api/domain/SysUser.java
@@ -135,8 +135,46 @@ public class SysUser extends BaseEntity
private Integer registrationInformationMedicStatus;
-
-
+ @Override
+ public String toString() {
+ return "SysUser{" +
+ "userId=" + userId +
+ ", deptId=" + deptId +
+ ", userName='" + userName + '\'' +
+ ", nickName='" + nickName + '\'' +
+ ", email='" + email + '\'' +
+ ", phonenumber='" + phonenumber + '\'' +
+ ", personalResume='" + personalResume + '\'' +
+ ", affiliatedHospital='" + affiliatedHospital + '\'' +
+ ", areaExpertise='" + areaExpertise + '\'' +
+ ", sex='" + sex + '\'' +
+ ", avatar='" + avatar + '\'' +
+ ", password='" + password + '\'' +
+ ", status='" + status + '\'' +
+ ", delFlag='" + delFlag + '\'' +
+ ", loginIp='" + loginIp + '\'' +
+ ", loginDate=" + loginDate +
+ ", dept=" + dept +
+ ", roles=" + roles +
+ ", roleIds=" + Arrays.toString(roleIds) +
+ ", postIds=" + Arrays.toString(postIds) +
+ ", roleId=" + roleId +
+ ", userSign='" + userSign + '\'' +
+ ", bindWechatStatus=" + bindWechatStatus +
+ ", realNameAuthenticationStatus=" + realNameAuthenticationStatus +
+ ", bindBankCardStatus=" + bindBankCardStatus +
+ ", userMoney=" + userMoney +
+ ", invitationCode='" + invitationCode + '\'' +
+ ", differentialState=" + differentialState +
+ ", medicalDepartmentId=" + medicalDepartmentId +
+ ", professionalTitleDoctorId=" + professionalTitleDoctorId +
+ ", numberPatientsServed=" + numberPatientsServed +
+ ", consultingPrice=" + consultingPrice +
+ ", praise=" + praise +
+ ", registrationInformationExamineStatus=" + registrationInformationExamineStatus +
+ ", registrationInformationMedicStatus=" + registrationInformationMedicStatus +
+ '}';
+ }
public SysUser(Long userId, Long deptId, String userName, String nickName, String email, String phonenumber, String personalResume, String affiliatedHospital, String areaExpertise, String sex, String avatar, String password, String status, String delFlag, String loginIp, Date loginDate, SysDept dept, List roles, Long[] roleIds, Long[] postIds, Long roleId, String userSign, Integer bindWechatStatus, Integer realNameAuthenticationStatus, Integer bindBankCardStatus, BigDecimal userMoney, String invitationCode, Integer differentialState) {
this.userId = userId;
diff --git a/four-api-system/target/classes/com/four/system/api/domain/SysRole.class b/four-api-system/target/classes/com/four/system/api/domain/SysRole.class
index f3d3c69..f273755 100644
Binary files a/four-api-system/target/classes/com/four/system/api/domain/SysRole.class and b/four-api-system/target/classes/com/four/system/api/domain/SysRole.class differ
diff --git a/four-api-system/target/classes/com/four/system/api/domain/SysUser.class b/four-api-system/target/classes/com/four/system/api/domain/SysUser.class
index a2de29d..b547273 100644
Binary files a/four-api-system/target/classes/com/four/system/api/domain/SysUser.class and b/four-api-system/target/classes/com/four/system/api/domain/SysUser.class differ
diff --git a/four-api-system/target/four-api-system-3.6.3.jar b/four-api-system/target/four-api-system-3.6.3.jar
index 1e4435c..9ad0461 100644
Binary files a/four-api-system/target/four-api-system-3.6.3.jar and b/four-api-system/target/four-api-system-3.6.3.jar differ
diff --git a/four-api-system/target/maven-archiver/pom.properties b/four-api-system/target/maven-archiver/pom.properties
index 7cbb240..b7011a8 100644
--- a/four-api-system/target/maven-archiver/pom.properties
+++ b/four-api-system/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
#Generated by Maven
-#Thu Nov 02 20:24:25 CST 2023
+#Fri Nov 03 08:26:54 CST 2023
groupId=com.four
artifactId=four-api-system
version=3.6.3