Merge remote-tracking branch 'origin/master'

jeecg-module-interlock/src/main/java/org/jeecg/modules/history/mapper/xml/InterlockDetailHistoryMapper.xml

@@ -248,7 +248,7 @@
             <if test="dto.endTime != null"> and s.tag_time &lt; #{dto.endTime} </if>
             <if test="dto.bypass != null and dto.bypass != ''"> and d.bypass = #{dto.bypass}</if>
         </where>
-        order by s.tag_time desc
+        order by s.tag_time desc, d.interlockname desc, d.summaryid desc
     </select>
 
     <!-- 联锁总历史数据表-分页列表查询（各种逻辑状态）   添加权限  系统管理员权限-->
@@ -310,7 +310,7 @@
             <if test="dto.endTime != null"> and s.tag_time &lt; #{dto.endTime} </if>
             <if test="dto.bypass != null and dto.bypass != ''"> and d.bypass = #{dto.bypass}</if>
         </where>
-        order by s.tag_time desc
+        order by s.tag_time desc, d.interlockname desc, d.summaryid desc
     </select>