Merge remote-tracking branch 'origin/master'

linwei

2024-01-24 bdc5d99198b06b9e3fd5e6794d2efea36398b60a

 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml

@@ -61,7 +61,7 @@
            </foreach>
            )
        </if>
        ORDER BY id
        ORDER BY create_time desc
    </select>

    <select id="getUser" resultMap="userResultMap">