记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
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
董敬伟
liquidnet-bus-v1
Commits
dfbfb1c2
Commit
dfbfb1c2
authored
Jan 05, 2022
by
jiangxiulong
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'jxl_1214_refund' into dev_merchant
parents
ef40e207
b6ce285c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
KylinOrderTicketsMapper.xml
...iquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml
+1
-1
No files found.
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml
View file @
dfbfb1c2
...
...
@@ -340,7 +340,7 @@
<if
test=
"expressContacts != null and expressContacts != ''"
>
AND kot.express_contacts LIKE concat('%',
#{expressContacts}, '%')
</if>
<if
test=
"expressStatus != '' and expressStatus != 1 and expressStatus != 70"
>
AND oe.express_status =
<if
test=
"expressStatus != '' and expressStatus != 1 and expressStatus != 70
and expressStatus != 80
"
>
AND oe.express_status =
${expressStatus}
</if>
<if
test=
"expressStatus == 1"
>
AND (oe.express_status IS NULL OR oe.express_status = ${expressStatus})
</if>
...
...
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