Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
performance
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zry
performance
Commits
9dc64c89
Commit
9dc64c89
authored
Apr 12, 2023
by
wyc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
‘考勤下发’考勤类型方法参数还原
parent
bceba9cf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
performance/Performance.Api/Controllers/AttendanceController.cs
+2
-2
performance/Performance.Api/Controllers/AttendanceController.cs.rej
+9
-0
No files found.
performance/Performance.Api/Controllers/AttendanceController.cs
View file @
9dc64c89
...
...
@@ -149,7 +149,7 @@ public ApiResponse AttendanceClearAll(int allotId)
/// </summary>
/// <param name="allotId"></param>
/// <returns></returns>
[
HttpGet
(
"Type/{allotId}"
)]
[
HttpGet
(
"Type/{allotId}
,{hospitalId}
"
)]
public
ApiResponse
<
List
<
per_attendance_type
>>
GetAttendanceType
(
int
allotId
)
{
return
_attendanceService
.
GetAttendanceType
(
allotId
);
...
...
@@ -160,7 +160,7 @@ public ApiResponse<List<per_attendance_type>> GetAttendanceType(int allotId)
/// <param name="allotId"></param>
/// <param name="attendanceType"></param>
/// <returns></returns>
[
HttpPost
(
"Type/Edit/{allotId}"
)]
[
HttpPost
(
"Type/Edit/{allotId}
,{hospitalId}
"
)]
public
ApiResponse
<
AttendanceType
>
InsertAttendanceType
(
int
allotId
,
AttendanceType
attendanceType
)
{
// obj自己定义结构
...
...
performance/Performance.Api/Controllers/AttendanceController.cs.rej
0 → 100644
View file @
9dc64c89
diff a/performance/Performance.Api/Controllers/AttendanceController.cs b/performance/Performance.Api/Controllers/AttendanceController.cs (rejected hunks)
@@ -160,7 +160,6 @@
/// <param name="allotId"></param>
/// <param name="attendanceType"></param>
/// <returns></returns>
- [HttpPost("Type/Edit/{allotId},{hospitalId}")]
[HttpPost("Type/Edit/{allotId}")]
public ApiResponse<AttendanceType> InsertAttendanceType(int allotId, AttendanceType attendanceType)
{
Write
Preview
Markdown
is supported
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