Merge remote-tracking branch 'origin/master'

ruoyi-basetyre/src/main/resources/mapper/basetyre/CollectMachineGpsMapper.xml

@@ -61,9 +61,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dimensionalNOrS != null "> and dimensional_n_or_s = #{dimensionalNOrS}</if>
             <if test="longitudinalEOrW != null "> and longitudinal_e_or_w = #{longitudinalEOrW}</if>
             <if test="dLIsencryption != null "> and d_l_isencryption = #{dLIsencryption}</if>
-            <if test="latitude != null "> and latitude = #{latitude}</if>
-            <if test="longitude != null "> and longitude = #{longitude}</if>
-            <if test="altitude != null "> and altitude = #{altitude}</if>
+
+
             <if test="speed != null "> and speed = #{speed}</if>
             <if test="course != null "> and course = #{course}</if>
             <if test="createTime != null "> and create_time = #{createTime}</if>

ruoyi-ui/src/api/GPS/car.js

@@ -4,7 +4,7 @@ import request from '@/utils/request'
 // 查询轮胎基础信息列表
 export function listTest(query) {
     return request({
-        url: '/test/test/list',
+        url: '/basetyre/CollectMachineGps/list',
         method: 'get',
         params: query
     })