Merge remote-tracking branch 'origin/master'

ruoyi-wages/src/main/java/com/ruoyi/system/controller/WagesController.java

@@ -85,7 +85,8 @@ public class WagesController {
     @RequestMapping("/lxWages")
     public AjaxResult LinXiExcelAnalysisWages(@RequestParam("file") MultipartFile file, @RequestParam String date, @RequestParam String mineId, @RequestParam String identification){
         String s = wagesService.linXiExcelAnalysisWages(file, date, mineId, identification);
-        return new AjaxResult(200, s);
+        int n = s.equals("请填写excel表类型") ? 500 : s.equals("对照表不完善") ? 500 : 200;
+        return new AjaxResult(n, s);
     }