Merge branch 'origin/Three' into 'develop_master'
Origin/three See merge request LiuChao/foton-slrs-system-rest!274
This commit is contained in:
@@ -21,7 +21,7 @@
|
||||
and name like concat('%',#{name},'%')
|
||||
</if>
|
||||
<if test="project_id != null and project_id != ''">
|
||||
and project_id = #{project_id}
|
||||
and project_id = #{projectId}
|
||||
</if>
|
||||
<if test="project_name != null and project_name != ''">
|
||||
and project_name = #{project_name}
|
||||
@@ -111,7 +111,7 @@
|
||||
name = #{name},
|
||||
</if>
|
||||
<if test="project_id != null and project_id != ''">
|
||||
project_id = #{project_id},
|
||||
project_id = #{projectId},
|
||||
</if>
|
||||
<if test="project_name != null and project_name != ''">
|
||||
project_name = #{project_name},
|
||||
@@ -254,7 +254,7 @@
|
||||
#{name},
|
||||
</if>
|
||||
<if test="project_id != null and project_id != ''">
|
||||
#{project_id},
|
||||
#{projectId},
|
||||
</if>
|
||||
<if test="project_name != null and project_name != ''">
|
||||
#{project_name},
|
||||
|
||||
Reference in New Issue
Block a user