fix merge

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -284,7 +284,7 @@
         <if test="userId != null and userId != ''">
             and u.user_id= #{userId}
         </if>
-        order by u.update_time desc
+        order by u.create_time desc
     </select>