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
47e7cec2
Commit
47e7cec2
authored
Dec 09, 2019
by
jiaorz
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master-vehicle-count-bug' into dev
parents
5dee7da8
4c882504
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
BaseOrderMapper.xml
...rder-server/src/main/resources/mapper/BaseOrderMapper.xml
+2
-2
No files found.
xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml
View file @
47e7cec2
...
@@ -327,7 +327,7 @@
...
@@ -327,7 +327,7 @@
(
(
(
(
orv.start_time
>
#{startTime}
orv.start_time
>
#{startTime}
AND orv.start_time
<
#{
start
Time}
AND orv.start_time
<
#{
end
Time}
AND orv.end_time
>
#{endTime}
AND orv.end_time
>
#{endTime}
)
)
OR (
OR (
...
@@ -336,7 +336,7 @@
...
@@ -336,7 +336,7 @@
)
)
OR (
OR (
orv.start_time
<
#{startTime}
orv.start_time
<
#{startTime}
AND orv.end_time
>
#{
end
Time}
AND orv.end_time
>
#{
start
Time}
AND orv.end_time
<
#{endTime}
AND orv.end_time
<
#{endTime}
)
)
OR (
OR (
...
...
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