Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gs1-office-web-sit
Overview
Overview
Details
Activity
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
吴迪
gs1-office-web-sit
Commits
b171870a
Commit
b171870a
authored
Dec 08, 2021
by
rongkailun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【修改】数据格式调整
parent
989ae640
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
PictureController.java
...o/office/modules/manage/controller/PictureController.java
+2
-2
No files found.
src/main/java/io/office/modules/manage/controller/PictureController.java
View file @
b171870a
...
@@ -154,7 +154,7 @@ public class PictureController extends AbstractController {
...
@@ -154,7 +154,7 @@ public class PictureController extends AbstractController {
Page
<
PictureEntity
>
page
=
this
.
pictureService
.
selectPictureNewList
(
params
,
Page
<
PictureEntity
>
page
=
this
.
pictureService
.
selectPictureNewList
(
params
,
new
Page
(
params
.
getPage
(),
params
.
getLimit
()));
new
Page
(
params
.
getPage
(),
params
.
getLimit
()));
PageUtils
pageUtils
=
new
PageUtils
(
page
);
PageUtils
pageUtils
=
new
PageUtils
(
page
);
return
R
.
ok
().
put
(
"
page
"
,
pageUtils
);
return
R
.
ok
().
put
(
"
data
"
,
pageUtils
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
error
(
"pictureList error:"
,
e
);
log
.
error
(
"pictureList error:"
,
e
);
return
R
.
error
(
e
.
getMessage
());
return
R
.
error
(
e
.
getMessage
());
...
@@ -169,7 +169,7 @@ public class PictureController extends AbstractController {
...
@@ -169,7 +169,7 @@ public class PictureController extends AbstractController {
// @RequiresPermissions("generator:picture:info")
// @RequiresPermissions("generator:picture:info")
public
R
getDetail
(
@PathVariable
(
"pictureid"
)
Integer
pictureid
){
public
R
getDetail
(
@PathVariable
(
"pictureid"
)
Integer
pictureid
){
PictureEntity
picture
=
pictureService
.
getById
(
pictureid
);
PictureEntity
picture
=
pictureService
.
getById
(
pictureid
);
return
R
.
ok
().
put
(
"
picture
"
,
picture
);
return
R
.
ok
().
put
(
"
data
"
,
picture
);
}
}
}
}
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