Merge remote-tracking branch 'origin/master'

This commit is contained in:
zk
2026-03-26 16:46:21 +08:00
2 changed files with 2 additions and 2 deletions
@@ -16,7 +16,7 @@ import java.time.Instant;
@TableName(value = "bg_user_profile_skill_tag_relation") @TableName(value = "bg_user_profile_skill_tag_relation")
public class UserProfileSkillTagRelation { public class UserProfileSkillTagRelation {
@TableId(type = IdType.AUTO) @TableId(type = IdType.ASSIGN_ID)
private Long id; private Long id;
/** 用户ID */ /** 用户ID */
@@ -64,7 +64,7 @@
<if test="keyword != null and keyword.length()>0"> <if test="keyword != null and keyword.length()>0">
AND AND
( (
c.title like concat("%",#{keyword},"%") j.title like concat("%",#{keyword},"%")
or or
c.name like concat("%",#{keyword},"%") c.name like concat("%",#{keyword},"%")
) )