Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

Conflicts: .gitignore ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml ruoyi-ui/src/components/FileUpload/index.vue ruoyi-ui/src/views/tool/build/index.vue
2025-09-24 07:19:46 +08:00 · 2022-02-14 14:27:13 +08:00
parent 8a2f988be6 81630a096f
commit ee2f74dc5e
30 changed files with 918 additions and 915 deletions
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
@ -35,7 +35,7 @@ public interface SysUserMapper extends BaseMapperPlus<SysUserMapper, SysUser, Sy
    List<SysUser> selectUserList(SysUser sysUser);

    /**
-     * 根据条件分页查询未已配用户角色列表
+     * 根据条件分页查询已配用户角色列表
     *
     * @param user 用户信息
     * @return 用户信息集合信息
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
@ -67,7 +67,6 @@ public interface ISysConfigService {
     * 批量删除参数信息
     *
     * @param configIds 需要删除的参数ID
-     * @return 结果
     */
    void deleteConfigByIds(Long[] configIds);

--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
@ -45,7 +45,6 @@ public interface ISysDictDataService {
     * 批量删除字典数据信息
     *
     * @param dictCodes 需要删除的字典数据ID
-     * @return 结果
     */
    void deleteDictDataByIds(Long[] dictCodes);

--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
@ -60,7 +60,6 @@ public interface ISysDictTypeService {
     * 批量删除字典信息
     *
     * @param dictIds 需要删除的字典ID
-     * @return 结果
     */
    void deleteDictTypeByIds(Long[] dictIds);

--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java
@ -35,7 +35,7 @@ public interface ISysLogininforService {
     * 批量删除系统登录日志
     *
     * @param infoIds 需要删除的登录日志ID
-     * @return
+     * @return 结果
     */
    int deleteLogininforByIds(Long[] infoIds);

--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java
@ -84,7 +84,6 @@ public interface ISysPostService {
     *
     * @param postIds 需要删除的岗位ID
     * @return 结果
-     * @throws Exception 异常
     */
    int deletePostByIds(Long[] postIds);

--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
@ -153,7 +153,6 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
     * 批量删除参数信息
     *
     * @param configIds 需要删除的参数ID
-     * @return 结果
     */
    @Override
    public void deleteConfigByIds(Long[] configIds) {
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
@ -83,7 +83,6 @@ public class SysDictDataServiceImpl implements ISysDictDataService {
     * 批量删除字典数据信息
     *
     * @param dictCodes 需要删除的字典数据ID
-     * @return 结果
     */
    @Override
    public void deleteDictDataByIds(Long[] dictCodes) {
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
@ -123,7 +123,6 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
     * 批量删除字典类型信息
     *
     * @param dictIds 需要删除的字典ID
-     * @return 结果
     */
    @Override
    public void deleteDictTypeByIds(Long[] dictIds) {
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
@ -140,7 +140,7 @@ public class SysLogininforServiceImpl implements ISysLogininforService, Logininf
     * 批量删除系统登录日志
     *
     * @param infoIds 需要删除的登录日志ID
-     * @return
+     * @return 结果
     */
    @Override
    public int deleteLogininforByIds(Long[] infoIds) {
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
@ -148,7 +148,6 @@ public class SysPostServiceImpl implements ISysPostService {
     *
     * @param postIds 需要删除的岗位ID
     * @return 结果
-     * @throws Exception 异常
     */
    @Override
    public int deletePostByIds(Long[] postIds) {
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
@ -374,7 +374,7 @@ public class SysRoleServiceImpl implements ISysRoleService {
     * 批量选择授权用户角色
     *
     * @param roleId  角色ID
-     * @param userIds 需要删除的用户数据ID
+     * @param userIds 需要授权的用户数据ID
     * @return 结果
     */
    @Override