Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
Education
Project
Project
Details
Activity
Releases
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄奎
Education
Commits
51b9383f
Commit
51b9383f
authored
Mar 17, 2021
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
8366175b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
OKRPeriodModule.cs
Edu.Module.OKR/OKRPeriodModule.cs
+2
-0
OKRPeriodController.cs
Edu.WebApi/Controllers/OKR/OKRPeriodController.cs
+0
-1
No files found.
Edu.Module.OKR/OKRPeriodModule.cs
View file @
51b9383f
...
...
@@ -6478,6 +6478,7 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value:yyyy-MM-dd}' and {ruleModel.Time
y
.
ProgressState
,
ProgressStateName
=
y
.
ProgressState
.
ToName
(),
y
.
ParentNum
,
UserId
=
y
.
CreateBy
,
y
.
EmName
,
y
.
EmPhoto
});
...
...
@@ -6665,6 +6666,7 @@ and {ruleModel.Time} >='{dmodel.RuleSTime.Value:yyyy-MM-dd}' and {ruleModel.Time
y
.
ProgressState
,
ProgressStateName
=
y
.
ProgressState
.
ToName
(),
y
.
ChildNum
,
UserId
=
y
.
CreateBy
,
y
.
EmName
,
y
.
EmPhoto
});
...
...
Edu.WebApi/Controllers/OKR/OKRPeriodController.cs
View file @
51b9383f
...
...
@@ -1096,7 +1096,6 @@ namespace Edu.WebApi.Controllers.OKR
[
HttpPost
]
public
ApiResult
GetOKROthersObjectiveInfo
()
{
var
userInfo
=
base
.
UserInfo
;
JObject
parms
=
JObject
.
Parse
(
RequestParm
.
Msg
.
ToString
());
int
ObjectiveId
=
parms
.
GetInt
(
"ObjectiveId"
,
0
);
...
...
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