Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -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},"%")
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user