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
JSH ERP
Commits
2fe10c75
Commit
2fe10c75
authored
May 06, 2019
by
qiankunpingtai
Browse files
修改导出时既返回流又返回json数据导致后台异常的问题
parent
b82c0d39
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/main/java/com/jsh/erp/controller/SupplierController.java
View file @
2fe10c75
...
...
@@ -290,7 +290,7 @@ public class SupplierController {
* @return
*/
@GetMapping
(
value
=
"/exportExcel"
)
public
BaseResponseInfo
exportExcel
(
@RequestParam
(
"supplier"
)
String
supplier
,
public
void
exportExcel
(
@RequestParam
(
"supplier"
)
String
supplier
,
@RequestParam
(
"type"
)
String
type
,
@RequestParam
(
"phonenum"
)
String
phonenum
,
@RequestParam
(
"telephone"
)
String
telephone
,
...
...
@@ -338,7 +338,6 @@ public class SupplierController {
map
.
put
(
"message"
,
message
);
res
.
data
=
map
;
}
return
res
;
}
/**
...
...
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