|
|
554a0893c3
|
征询本人意见后删除了meetingController中的无效方法
|
2024-07-06 00:11:14 +08:00 |
|
|
|
8b12bb4201
|
Merge remote-tracking branch 'origin/MeetingByJerry' into merge/1
# Conflicts:
# src/main/java/org/cmh/backend/authentication/repository/UserRepository.java
# src/main/java/org/cmh/backend/authentication/service/UserService.java
|
2024-07-06 00:06:32 +08:00 |
|
|
|
50bfce4b23
|
微调了俩fileController避免冲突
|
2024-07-06 00:02:50 +08:00 |
|
|
|
8728f7f454
|
Merge remote-tracking branch 'origin/Chester' into merge/1
# Conflicts:
# src/main/java/org/cmh/backend/authentication/controller/AuthenticationController.java
# src/main/java/org/cmh/backend/authentication/controller/UserController.java
# src/main/java/org/cmh/backend/authentication/dto/LoginRequest.java
# src/main/java/org/cmh/backend/authentication/dto/RegisterResponse.java
# src/main/java/org/cmh/backend/authentication/model/User.java
# src/main/java/org/cmh/backend/authentication/repository/UserRepository.java
# src/main/java/org/cmh/backend/authentication/service/UserService.java
# src/main/resources/application.properties
|
2024-07-05 23:59:21 +08:00 |
|
|
|
b2a7f8b6eb
|
这里分权限进行不同请求
|
2024-07-05 23:50:20 +08:00 |
|
|
|
cff3b43983
|
添加getAllUsers和getUsersByTenant方法
|
2024-07-05 23:48:00 +08:00 |
|
|
|
82cb9d79ba
|
添加了一点点注释
|
2024-07-05 23:43:42 +08:00 |
|
|
|
fd65ed2c60
|
添加了一点点注释，/getAll那里还有问题
|
2024-07-05 23:41:19 +08:00 |
|
|
|
83d6713e93
|
Merge remote-tracking branch 'origin/merge/1' into merge/1
# Conflicts:
# src/main/java/org/cmh/backend/UserManagement/controller/UserManagementController.java
|
2024-07-05 23:39:31 +08:00 |
|
|
|
a57b4be921
|
删除crossOrigin，添加总RequestMapping
|
2024-07-05 23:36:52 +08:00 |
|
|
|
fca88ffd68
|
删除OrganizationController中的无效依赖
|
2024-07-05 23:36:18 +08:00 |
|
|
|
e14bbcd2f8
|
Merge remote-tracking branch 'origin/merge/1' into merge/1
|
2024-07-05 23:35:56 +08:00 |
|
|
|
722fb47302
|
尝试修改User
|
2024-07-05 23:35:45 +08:00 |
|
|
|
2f57ff6a4c
|
修改了delete方法
|
2024-07-05 23:35:28 +08:00 |
|
|
|
ac677f1728
|
对User中的注释的无关紧要的修改
|
2024-07-05 23:35:05 +08:00 |
|
|
|
cdc1cefd85
|
添加了addUser和deleteUser的方法
|
2024-07-05 23:08:33 +08:00 |
|
|
|
1a42273465
|
Merge remote-tracking branch 'origin/personal/pjq/organization' into merge/1
# Conflicts:
# src/main/java/org/cmh/backend/authentication/controller/AuthenticationController.java
# src/main/java/org/cmh/backend/authentication/repository/UserRepository.java
# src/main/java/org/cmh/backend/authentication/service/UserService.java
|
2024-07-05 21:02:22 +08:00 |
|
|
|
18966c0a93
|
添加了tenant字段
|
2024-07-05 20:55:02 +08:00 |
|
|
|
6643a7bdbb
|
去掉了外键约束
|
2024-07-05 20:51:13 +08:00 |
|
|
|
ba638747df
|
外键约束
|
2024-07-05 20:21:27 +08:00 |
|
|
|
ffa9189583
|
标准化租户表
|
2024-07-05 19:31:25 +08:00 |
|
|
|
ba886c7191
|
还剩测试没做
|
2024-07-05 19:18:41 +08:00 |
|
|
|
8b25a92b77
|
Merge branch 'personal/heshunme/news' into merge
|
2024-07-05 17:20:47 +08:00 |
|
|
|
11c548e7bd
|
临时改名避免冲突
|
2024-07-05 17:07:54 +08:00 |
|
|
|
afdcfa60fb
|
Merge branch 'personal/lsd/UserManagement' into merge
# Conflicts:
# src/main/java/org/cmh/backend/authentication/controller/AuthenticationController.java
# src/main/java/org/cmh/backend/authentication/repository/UserRepository.java
# src/main/java/org/cmh/backend/authentication/service/UserService.java
|
2024-07-05 17:05:31 +08:00 |
|
|
|
76ca17cf41
|
删除/移动auth相关内容
|
2024-07-05 17:04:51 +08:00 |
|
|
|
7a6d2b5c4b
|
recovery
|
2024-07-05 16:32:33 +08:00 |
|
|
|
55e40288df
|
Merge branch 'main' into personal/heshunme/auth-restart-1
# Conflicts:
# src/main/java/org/cmh/backend/authentication/controller/UserController.java
# src/main/resources/application.properties
|
2024-07-05 15:04:06 +08:00 |
|
|
|
05f3af0c77
|
基本完成
|
2024-07-05 14:40:15 +08:00 |
|
|
|
c42a3a55ec
|
完善了搜索功能
|
2024-07-05 14:02:31 +08:00 |
|
|
|
33f811e6b7
|
GPT牛逼，搜索搞成了
|
2024-07-05 06:20:30 +08:00 |
|
|
|
9e03bb3873
|
能搜了，就是有点问题，范围太广，啥都搜到了
|
2024-07-05 06:11:11 +08:00 |
|
|
|
f104c89d08
|
初步添加了用户权限区别对待。
|
2024-07-05 02:21:59 +08:00 |
|
|
|
d027e26f8c
|
完善了删除功能
|
2024-07-05 01:52:46 +08:00 |
|
|
|
f9272335f2
|
修改了其他模块中的order字段名为orderNo
|
2024-07-04 23:05:42 +08:00 |
|
|
|
5885f365db
|
修改了order字段名为orderNo
|
2024-07-04 23:02:49 +08:00 |
|
|
|
780e4793de
|
去掉了verify
|
2024-07-04 22:51:24 +08:00 |
|
|
|
f6d5112ad5
|
更新了CourseController
|
2024-07-04 22:50:35 +08:00 |
|
|
|
dafdf82f5d
|
更新了Course相关dto
|
2024-07-04 22:50:11 +08:00 |
|
|
|
aae8147143
|
修改了全局文件上传大小限制
|
2024-07-04 22:49:48 +08:00 |
|
|
|
fe58248efc
|
完成了Course的相关支持
|
2024-07-04 22:49:05 +08:00 |
|
|
|
9569a30a8a
|
完成了文件上传的Controller
|
2024-07-04 22:47:52 +08:00 |
|
|
|
ef10067345
|
2
|
2024-07-04 21:21:46 +08:00 |
|
|
|
d1fa646f95
|
后端完成版（也许？
|
2024-07-04 20:50:16 +08:00 |
|
|
|
54f055dea9
|
只有组织管理模块.新
|
2024-07-04 17:37:53 +08:00 |
|
|
|
bdba24dc26
|
Revert "只有组织管理模块"
This reverts commit 9fb75be5ab.
|
2024-07-04 17:35:47 +08:00 |
|
|
|
9fb75be5ab
|
只有组织管理模块
|
2024-07-04 17:33:15 +08:00 |
|
|
|
aa8ca4e274
|
solve conflict
|
2024-07-04 17:26:39 +08:00 |
|
|
|
d2e3443c40
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# src/main/java/org/cmh/backend/authentication/controller/UserController.java
|
2024-07-04 17:16:30 +08:00 |
|
|
|
1e874606f3
|
完成组织管理(测试用)
|
2024-07-04 17:09:24 +08:00 |
|
