|
|
@@ -487,6 +487,7 @@ |
|
|
and o.tenant_id=#{tenantId} |
|
|
and o.tenant_id=#{tenantId} |
|
|
<if test=" null != id "> |
|
|
<if test=" null != id "> |
|
|
and cm.`merchant_id` = #{id} |
|
|
and cm.`merchant_id` = #{id} |
|
|
|
|
|
and mb.merchant_id = #{id} |
|
|
</if> |
|
|
</if> |
|
|
|
|
|
|
|
|
<if test=" null != userName "> |
|
|
<if test=" null != userName "> |
|
|
|