Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java

ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java

@@ -69,7 +69,7 @@ public class AppPmsController extends BaseController {
         // 判断入库单号是否重复
         AppPmsOrderIn existAppPmsOrderIn = appPmsOrderInService.selectAppPmsOrderInByListId(orderInRequest.getListId());
         if (existAppPmsOrderIn != null) {
-            return error("入库单号重复。");
+           return AjaxResult.error(201,"入库单已存在");
         }
         AppPmsOrderIn appPmsOrderIn = new AppPmsOrderIn();
         BeanUtils.copyProperties(orderInRequest, appPmsOrderIn);

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java

@@ -23,6 +23,7 @@ public class AjaxResult extends HashMap<String, Object>
     /** 数据对象 */
     public static final String DATA_TAG = "data";
 
+
     /**
      * 初始化一个新创建的 AjaxResult 对象，使其表示一个空消息。
      */
@@ -59,6 +60,8 @@ public class AjaxResult extends HashMap<String, Object>
         }
     }
 
+
+
     /**
      * 返回成功消息
      * 
@@ -102,6 +105,16 @@ public class AjaxResult extends HashMap<String, Object>
         return new AjaxResult(HttpStatus.SUCCESS, msg, data);
     }
 
+    public static AjaxResult success(int code,String msg, Object returnDate)
+    {
+        return new AjaxResult(code, msg, returnDate);
+    }
+
+    public static AjaxResult success(int code,String msg)
+    {
+        return new AjaxResult(code, msg);
+    }
+
     /**
      * 返回警告消息
      *