Merge remote-tracking branch 'origin/master'

src/main/resources/com/steerinfo/dil/mapper/QmsQueueResultMapper.xml

@@ -906,7 +906,7 @@
             ORDER BY QQL.ENTRY_SURE_TIME DESC, QQL.IS_VIP, "listNodeOrder"
         </if>
         <if test="locationId == null">
-            ORDER BY QQL.ENTRY_SURE_TIME DESC, QQR.RESULT_START_TIME
+            ORDER BY QQL.ENTRY_SURE_TIME DESC, QQL.IS_VIP, "listNodeOrder",QQR.RESULT_START_TIME
         </if>
         ) P0
 
@@ -1068,7 +1068,7 @@
                 ORDER BY  QQSL.ENTRY_SURE_TIME DESC, QQSL.IS_VIP,  "listNodeOrder"
             </if>
             <if test="locationId == null">
-                ORDER BY QQSL.ENTRY_SURE_TIME DESC, QQR.RESULT_START_TIME
+                ORDER BY QQSL.ENTRY_SURE_TIME DESC, QQR.RESULT_START_TIME,QQL.IS_VIP, "listNodeOrder"
             </if>
     </select>