Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
Litemall
Commits
82a4a483
Commit
82a4a483
authored
Apr 14, 2019
by
Junling Bu
Browse files
refactor[litemall-admin-api]: 关键字变量命名调整
parent
94107e65
Changes
1
Hide whitespace changes
Inline
Side-by-side
litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminKeywordController.java
View file @
82a4a483
...
...
@@ -37,11 +37,11 @@ public class AdminKeywordController {
@RequestParam
(
defaultValue
=
"10"
)
Integer
limit
,
@Sort
@RequestParam
(
defaultValue
=
"add_time"
)
String
sort
,
@Order
@RequestParam
(
defaultValue
=
"desc"
)
String
order
)
{
List
<
LitemallKeyword
>
bran
dList
=
keywordService
.
querySelective
(
keyword
,
url
,
page
,
limit
,
sort
,
order
);
long
total
=
PageInfo
.
of
(
bran
dList
).
getTotal
();
List
<
LitemallKeyword
>
keywor
dList
=
keywordService
.
querySelective
(
keyword
,
url
,
page
,
limit
,
sort
,
order
);
long
total
=
PageInfo
.
of
(
keywor
dList
).
getTotal
();
Map
<
String
,
Object
>
data
=
new
HashMap
<>();
data
.
put
(
"total"
,
total
);
data
.
put
(
"items"
,
bran
dList
);
data
.
put
(
"items"
,
keywor
dList
);
return
ResponseUtil
.
ok
(
data
);
}
...
...
@@ -74,8 +74,8 @@ public class AdminKeywordController {
@RequiresPermissionsDesc
(
menu
={
"商场管理"
,
"关键词"
},
button
=
"详情"
)
@GetMapping
(
"/read"
)
public
Object
read
(
@NotNull
Integer
id
)
{
LitemallKeyword
bran
d
=
keywordService
.
findById
(
id
);
return
ResponseUtil
.
ok
(
bran
d
);
LitemallKeyword
keywor
d
=
keywordService
.
findById
(
id
);
return
ResponseUtil
.
ok
(
keywor
d
);
}
@RequiresPermissions
(
"admin:keyword:update"
)
...
...
Write
Preview
Supports
Markdown
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