|
|
|
@@ -80,11 +80,11 @@ |
|
|
|
</if> |
|
|
|
|
|
|
|
<if test=" null != begin"> |
|
|
|
and `begin_time` <= #{begin} |
|
|
|
and `begin_time` >= #{begin} |
|
|
|
</if> |
|
|
|
|
|
|
|
<if test=" null != end"> |
|
|
|
and `end_time` >= #{end} |
|
|
|
and `end_time` <= #{end} |
|
|
|
</if> |
|
|
|
|
|
|
|
<if test=" null != merchantName and merchantName != '' "> |
|
|
|
|