Merge remote-tracking branch 'origin/dev_2nd_period_test' into fix_2nd_period
This commit is contained in:
+5
@@ -120,6 +120,11 @@
|
|||||||
<if test="params.digitalPlatform != null and params.digitalPlatform != '' ">
|
<if test="params.digitalPlatform != null and params.digitalPlatform != '' ">
|
||||||
and plb.digital_platform like concat('%',#{params.digitalPlatform},'%')
|
and plb.digital_platform like concat('%',#{params.digitalPlatform},'%')
|
||||||
</if>
|
</if>
|
||||||
|
|
||||||
|
<!--搜索条件:品牌-->
|
||||||
|
<if test="params.brand != null and params.brand != '' ">
|
||||||
|
and plb.brand = #{params.brand}
|
||||||
|
</if>
|
||||||
</where>
|
</where>
|
||||||
order by plb.sort desc, plb.create_time desc
|
order by plb.sort desc, plb.create_time desc
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
Reference in New Issue
Block a user