-
# Conflicts: # ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml # ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml # ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml # ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml # ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml # ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
-
# Conflicts: # ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
-
# Conflicts: # ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml # ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml # sql/ry_20231130.sql
-
此处新密码加密了两次,多余的操作,且会导致新生成的数据库密码与缓存中的密码不同,如果修改的不对还请讲解回复下,谢谢。 Signed-off-by: 张利 <zhangli_wei555@163.com>
-
# Conflicts: # ruoyi-admin/src/main/resources/application.yml
-
Merge pull request !729 from WhiskyZulu/N/A
-
注释不太对,“数组计算”改为“数字计算” Signed-off-by: WhiskyZulu <a913681304@qq.com>
-
线条填歪了,看着难受 Signed-off-by: 万河 <12894283+science-01@user.noreply.gitee.com>
-
# Conflicts: # ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml # ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml