Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mall.oytour.com
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
黄奎
mall.oytour.com
Commits
bc65f2ff
Commit
bc65f2ff
authored
Sep 24, 2020
by
liudong1993
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/Kui2/mall.oytour.com
into sdzq-ld
parents
fd95ba06
563b182a
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
3 deletions
+1
-3
OrderController.cs
Mall.WebApi/Controllers/Product/OrderController.cs
+1
-3
No files found.
Mall.WebApi/Controllers/Product/OrderController.cs
View file @
bc65f2ff
...
@@ -468,9 +468,7 @@ namespace Mall.WebApi.Controllers.MallBase
...
@@ -468,9 +468,7 @@ namespace Mall.WebApi.Controllers.MallBase
x
.
MallBaseId
,
x
.
MallBaseId
,
x
.
SmallShopsId
,
x
.
SmallShopsId
,
x
.
SmallShopsName
,
x
.
SmallShopsName
,
CreateDate
=
x
.
CreateDate
.
HasValue
?
x
.
CreateDate
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
:
""
,
CreateDate
=
x
.
CreateDate
.
HasValue
?
x
.
CreateDate
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
:
""
TripETime
=
x
.
TripETime
.
HasValue
?
x
.
TripETime
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
:
""
,
TripSTime
=
x
.
TripSTime
.
HasValue
?
x
.
TripSTime
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
:
""
});
});
return
ApiResult
.
Success
(
""
,
pagelist
);
return
ApiResult
.
Success
(
""
,
pagelist
);
}
}
...
...
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