Merge remote-tracking branch 'origin/springboot3' into springboot3-satoken

README.md

@@ -83,6 +83,7 @@ JeecgBoot低代码平台兼容所有J2EE项目开发，支持信创国产化，
 - 官方网站：  [http://www.jeecg.com](http://www.jeecg.com)
 - 在线演示：  [平台演示](https://boot3.jeecg.com) | [APP演示](https://jeecg.com/appIndex)
 - 入门指南：  [快速入门](http://www.jeecg.com/doc/quickstart)  | [代码生成使用](https://help.jeecg.com/java/codegen/online) | [开发文档](https://help.jeecg.com)  | [AI应用手册](https://help.jeecg.com/aigc) | [视频教程](http://jeecg.com/doc/video)
+- AI编程实战视频：  [JEECG低代码与Cursor+GitHub Copilot实现AI高效编程实战](https://www.bilibili.com/video/BV11XyaBVEoH)
 - 技术支持：  [反馈问题](https://github.com/jeecgboot/JeecgBoot/issues/new?template=bug_report.md)    | [低代码体验一分钟](https://jeecg.blog.csdn.net/article/details/106079007) 
 - QQ交流群 ： 964611995、⑩716488839(满)、⑨808791225(满)、其他(满)
 

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/model/SysUserSysDepPostModel.java

@@ -21,6 +21,13 @@ public class SysUserSysDepPostModel {
      * 用户ID
      */
     private String id;
+    
+    /**
+     * 登录账号
+     */
+    @Excel(name = "登录账号", width = 15)
+    private String username;
+    
     /* 真实姓名 */
     private String realname;
 

jeecgboot-vue3/package.json

@@ -141,8 +141,8 @@
     "prettier": "^3.4.2",
     "pretty-quick": "^4.0.0",
     "rimraf": "^5.0.10",
-    "rollup": "^4.30.0",
-    "rollup-plugin-visualizer": "^5.13.1",
+    "rollup": "4.52.5",
+    "rollup-plugin-visualizer": "5.14.0",
     "stylelint": "^16.12.0",
     "stylelint-config-prettier": "^9.0.5",
     "stylelint-config-recommended": "^14.0.1",

jeecgboot-vue3/src/views/system/depart/depart.data.ts

@@ -172,6 +172,11 @@ export const orgCategoryOptions = {
  * 用户列表
  */
 export const userColumns: BasicColumn[] = [
+  {
+    title: '用户账号',
+    dataIndex: 'username',
+    width: 120,
+  },
   {
     title: '姓名',
     dataIndex: 'realname',