Merge remote-tracking branch 'origin/release-2024-04-25' into release-2024-04-25

# Conflicts:
#	luoo_user/src/main/resources/sql/20240719.sql

luoo_user/src/main/resources/sql/20240719.sql

@@ -52,7 +52,7 @@ create table tb_task_point
     update_time datetime null comment '修改时间',
     create_user varchar(20) null comment '创建人',
     update_user varchar(20) null comment '修改人',
-    valid       tinyint  default 1 null   comment '是否生效 1-生效 2-不生效'
+    valid       tinyint default 1 null comment '是否生效 1-生效 2-不生效'
 ) comment '任务积分配置表';
 
 INSERT INTO `tb_task_point` (`id`, `score`, `type`, `description`, `create_time`, `update_time`, `create_user`, `update_user`, `valid`) VALUES ('1', 1, 1, '新手欢迎奖励', '2024-07-31 14:23:58', '2024-07-31 14:23:58', NULL, NULL, 1);