Merge branch 'wanghaicheng' of lift-manager/lift-server into develop

lift-business-service/src/main/resources/mapper/maintenance/MaintenancePlanMapper.xml

@@ -178,7 +178,7 @@
 			AND <![CDATA[ mp.plan_date <= #{request.endTime}]]>
 		</if>
 		<if test="request.userId!=null">
-			order by IF(mp.worker_id = ${request.userId}, 0, 1)
+			order by IF(mp.worker_id = ${request.userId}, 0, 1),mp.lift_id
 		</if>
 	</select>