Merge branch 'master' of https://gitee.com/youlaiorg/youlai-boot into feature/noticews

# Conflicts: # src/main/java/com/youlai/boot/module/websocket/service/OnlineUserService.java
2024-09-14 10:47:07 +08:00
parent 9c765bda24 ef6889857a
commit 0c47c8eca9
20 changed files with 82 additions and 38 deletions
--- a/sql/mysql8/youlai_boot.sql
+++ b/sql/mysql8/youlai_boot.sql
@@ -396,7 +396,7 @@ INSERT INTO `sys_user_role` VALUES (3, 3);


 -- ----------------------------
-- Table structure for sys_user_role
+-- Table structure for sys_log
 -- ----------------------------
 DROP TABLE IF EXISTS `sys_log`;
 CREATE TABLE `sys_log` (