Merge remote-tracking branch 'origin/master'

2025-07-04 16:36:55 +08:00 · 2025-07-04 16:36:55 +08:00 · bdfad6b0f3
parent a5244f1a99 a1c385fcf1
commit bdfad6b0f3
1 changed files with 1 additions and 1 deletions
--- a/crm-common/src/main/resources/mapper/mapper_oracle/system/UserRoleMapper.xml
+++ b/crm-common/src/main/resources/mapper/mapper_oracle/system/UserRoleMapper.xml
@ -180,7 +180,7 @@
                )
            </if>
        </where>
-        ORDER BY b.create_time DESC
+        ORDER BY b.create_time DESC, b.id
    </select>

    <select id="countUserByRole" parameterType="map"  resultType="Integer">