Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
youjj
cloud-platform
Commits
a529a501
Commit
a529a501
authored
Aug 27, 2019
by
周健威
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master-bug-rent' into dev
parents
27e82649
4b9fb228
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
VehicleMapper.xml
...ehicle-server/src/main/resources/mapper/VehicleMapper.xml
+3
-3
No files found.
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml
View file @
a529a501
...
...
@@ -602,9 +602,9 @@
<if
test=
"lon != null and lat != null"
>
,st_distance_sphere(point(#{lon}, #{lat}), point(bc.longitude, bc.latitude)) as distance
</if>
<if
test=
" yearMonthAndParam !=null "
>
,ifnull(vbi.booked_date,0) as booked_date
</if
>
<!-- <if test=" yearMonthAndParam !=null ">--
>
<!-- ,ifnull(vbi.booked_date,0) as booked_date-->
<!-- </if>--
>
<include
refid=
"searchUsableSql"
/>
<if
test=
"lon != null and lat != null"
>
order by
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment