Merge remote-tracking branch 'ruoyi/master'

# Conflicts: # README.md # ruoyi-ui/package.json # ruoyi-ui/src/utils/index.js # ruoyi-ui/src/views/index.vue
2023-12-12 16:16:57 +08:00
parent e41d99e6aa 36b900cef8
commit 7752a502ac
54 changed files with 1116 additions and 1129 deletions
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java
@@ -37,7 +37,7 @@ public interface SysUserPostMapper
    /**
     * 批量新增用户岗位信息
     * 
-     * @param userPostList 用户角色列表
+     * @param userPostList 用户岗位列表
     * @return 结果
     */
    public int batchUserPost(List<SysUserPost> userPostList);