Merge branch 'dev_grid_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml

@@ -1016,10 +1016,10 @@
             </if>
             and CUSTOMER_ID = #{customerId}
             AND DEL_FLAG = '0'
+            order by created_time
             <if test="isPage != null and isPage">
                 LIMIT #{offset},#{pageSize}
             </if>
-            order by created_time
     </select>
     <select id="getPatrolDetailList" resultType="com.epmet.dto.user.result.MidPatrolDetailResult">
         select
@@ -1032,12 +1032,10 @@
             </if>
             and CUSTOMER_ID = #{customerId}
             AND DEL_FLAG = '0'
+            order by created_time
             <if test="isPage != null and isPage">
                 LIMIT #{offset},#{pageSize}
             </if>
-
-            order by created_time
-
     </select>
 
 </mapper>