Mobai
/
ruoyi-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Mobai:9d9e457d7a9fa1f0591479311b287ea30b51b6e8
Branches Tags
Mobai:day-05
Mobai:day-06
Mobai:day-04
Mobai:day-03
Mobai:day-02
Mobai:master
Mobai:muyu-service
...
compare: Mobai:9fec99677e89e8addd52daf00f9fdc4e87742c09
Branches Tags
Mobai:day-05
Mobai:day-06
Mobai:day-04
Mobai:day-03
Mobai:day-02
Mobai:master
Mobai:muyu-service

2 Commits
9d9e457d7a ... 9fec99677e

Author SHA1 Message Date
Saisai Liu 9fec99677e Merge remote-tracking branch 'serve/day-05' into day-05 
# Conflicts:
#	muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java
#	muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java
 2024-03-22 08:01:26 +08:00
Saisai Liu cb700cf596 品类组件响应，属性组bug修改 2024-03-22 07:59:41 +08:00
5 changed files with 75 additions and 75 deletions
Show Stats Expand all files Collapse all files

2
muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDept.java
View File

@ -204,7 +204,7 @@ public class SysDept extends BaseEntity {
.append("email", getEmail()) .append("email", getEmail())
.append("status", getStatus()) .append("status", getStatus())
.append("delFlag", getDelFlag()) .append("delFlag", getDelFlag())
.append("createBy", SecurityUtils.getUsername()) .append("createBy", getCreateBy())
.append("createTime", getCreateTime()) .append("createTime", getCreateTime())
.append("updateBy", getUpdateBy()) .append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime()) .append("updateTime", getUpdateTime())

2
muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDictData.java
View File

@ -175,7 +175,7 @@ public class SysDictData extends BaseEntity {
.append("listClass", getListClass()) .append("listClass", getListClass())
.append("isDefault", getIsDefault()) .append("isDefault", getIsDefault())
.append("status", getStatus()) .append("status", getStatus())
.append("createBy", SecurityUtils.getUsername()) .append("createBy", getCreateBy())
.append("createTime", getCreateTime()) .append("createTime", getCreateTime())
.append("updateBy", getUpdateBy()) .append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime()) .append("updateTime", getUpdateTime())

2
muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysDictType.java
View File

@ -96,7 +96,7 @@ public class SysDictType extends BaseEntity {
.append("dictName", getDictName()) .append("dictName", getDictName())
.append("dictType", getDictType()) .append("dictType", getDictType())
.append("status", getStatus()) .append("status", getStatus())
.append("createBy", SecurityUtils.getUsername()) .append("createBy", getCreateBy())
.append("createTime", getCreateTime()) .append("createTime", getCreateTime())
.append("updateBy", getUpdateBy()) .append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime()) .append("updateTime", getUpdateTime())

2
muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java
View File

@ -234,7 +234,7 @@ public class SysRole extends BaseEntity {
.append("deptCheckStrictly", isDeptCheckStrictly()) .append("deptCheckStrictly", isDeptCheckStrictly())
.append("status", getStatus()) .append("status", getStatus())
.append("delFlag", getDelFlag()) .append("delFlag", getDelFlag())
// .append("createBy", SecurityUtils.getUsername()) .append("createBy", getCreateBy())
.append("createTime", getCreateTime()) .append("createTime", getCreateTime())
.append("updateBy", getUpdateBy()) .append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime()) .append("updateTime", getUpdateTime())

2
muyu-common/muyu-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java
View File

@ -317,7 +317,7 @@ public class SysUser extends BaseEntity {
.append("delFlag", getDelFlag()) .append("delFlag", getDelFlag())
.append("loginIp", getLoginIp()) .append("loginIp", getLoginIp())
.append("loginDate", getLoginDate()) .append("loginDate", getLoginDate())
// .append("createBy", SecurityUtils.getUsername()) .append("createBy", getCreateBy())
.append("createTime", getCreateTime()) .append("createTime", getCreateTime())
.append("updateBy", getUpdateBy()) .append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime()) .append("updateTime", getUpdateTime())