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
4327f006
Commit
4327f006
authored
Mar 15, 2021
by
lcx
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v2020morge' into v2020morge-graphql
parents
2c56d8c7
782dcfae
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
2 deletions
+2
-2
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
+1
-1
performance/Performance.DtoModels/Response/DeptResponse.cs
+1
-1
performance/Performance.Services/ComputeService.cs
+0
-0
No files found.
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
View file @
4327f006
...
...
@@ -3046,7 +3046,7 @@
</member>
<member
name=
"P:Performance.DtoModels.DeptResponse.PerforTotal"
>
<summary>
绩效合计
考核前
绩效合计
</summary>
</member>
<member
name=
"P:Performance.DtoModels.DeptResponse.Avg"
>
...
...
performance/Performance.DtoModels/Response/DeptResponse.cs
View file @
4327f006
...
...
@@ -129,7 +129,7 @@ public class DeptResponse
public
Nullable
<
decimal
>
WorkloadFee
{
get
;
set
;
}
/// <summary>
/// 绩效合计
///
考核前
绩效合计
/// </summary>
public
Nullable
<
decimal
>
PerforTotal
{
get
;
set
;
}
...
...
performance/Performance.Services/ComputeService.cs
View file @
4327f006
This diff is collapsed.
Click to expand it.
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