|
|
e45e84c53a
|
revert ：取消合并用户管理，因为那是旧的版本
revert Merge remote-tracking branch 'origin/personal/lsd/UserManagement'
# 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 16:34:34 +08:00 |
|
|
|
3c8eb52ac0
|
Merge remote-tracking branch 'origin/personal/lsd/UserManagement'
# 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 15:11:13 +08:00 |
|
|
|
05ed80d460
|
Merge branch 'personal/heshunme/news'
|
2024-07-05 15:07:21 +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 |
|
|
|
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 |
|
|
|
b173b37329
|
租户管理完成增和改
|
2024-06-30 15:40:23 +08:00 |
|
