Merge branch 'develop' of http://192.168.0.110:8880/zry/performance into develop

performance/Performance.Api/Controllers/AllotController.cs

@@ -207,7 +207,7 @@ public ApiResponse AllotCheckResult([CustomizeValidator(RuleSet = "Delete"), Fro
             if (null == allot)
                 throw new PerformanceException("当前绩效记录不存在");
             var list = _allotService.AllotCheckResult(allot);
-            return new ApiResponse(ResponseType.OK);
+            return new ApiResponse(ResponseType.OK, list);
         }
     }
 }

performance/Performance.Services/UserService.cs

@@ -146,6 +146,7 @@ public UserResponse Insert(UserRequest request, int userid)
             user.CreateUser = userid;
             user.States = (int)States.Enabled;
             user.Department = request.Department;
+            user.IsDelete = 1;
 
             if (!_userRepository.Add(user))
                 throw new PerformanceException("保存失败");