Skip to content

K
klck
Commit 3d232d8c authored by Fuzy's avatar Fuzy
Browse files
Options

修正

parent 02bafaf4
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 3 deletions
ruoyi-wages/src/main/java/com/ruoyi/system/controller/WagesConversionController.java
View file @ 3d232d8c
...@@ -56,8 +56,12 @@ public class WagesConversionController extends BaseController { ...@@ -56,8 +56,12 @@ public class WagesConversionController extends BaseController {
return new AjaxResult(200, "成功", wagesConversionService.selectWagesConversionDataById(id)); return new AjaxResult(200, "成功", wagesConversionService.selectWagesConversionDataById(id));
} }
@GetMapping("/recentFormulas") @GetMapping("/recentFormulas/{id}")
public AjaxResult recentFormulas(@RequestParam("mineId") String mineId){ public AjaxResult recentFormulas(@RequestParam("id") String mineId){
return new AjaxResult(200, "成功", wagesConversionService.recentFormulas(mineId)); Object o = wagesConversionService.recentFormulas(mineId);
if (o instanceof List){
return new AjaxResult(200, "成功", o);
}
return new AjaxResult(500, (String) o, null);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment