Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
bdfad6b0f3
|
|
@ -180,7 +180,7 @@
|
||||||
)
|
)
|
||||||
</if>
|
</if>
|
||||||
</where>
|
</where>
|
||||||
ORDER BY b.create_time DESC
|
ORDER BY b.create_time DESC, b.id
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="countUserByRole" parameterType="map" resultType="Integer">
|
<select id="countUserByRole" parameterType="map" resultType="Integer">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue