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
9d2a514f
Commit
9d2a514f
authored
Mar 19, 2021
by
liudong1993
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/Kui2/education
parents
952e5425
0dd67d0d
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
RB_Course.cs
Edu.Model/Entity/Course/RB_Course.cs
+1
-1
CourseController.cs
Edu.WebApi/Controllers/Course/CourseController.cs
+1
-1
StudyAbroadController.cs
Edu.WebApi/Controllers/StudyAbroad/StudyAbroadController.cs
+1
-1
No files found.
Edu.Model/Entity/Course/RB_Course.cs
View file @
9d2a514f
...
@@ -129,6 +129,6 @@ namespace Edu.Model.Entity.Course
...
@@ -129,6 +129,6 @@ namespace Edu.Model.Entity.Course
/// <summary>
/// <summary>
/// 课时
/// 课时
/// </summary>
/// </summary>
public
int
ClassHours
{
get
;
set
;
}
public
decimal
ClassHours
{
get
;
set
;
}
}
}
}
}
\ No newline at end of file
Edu.WebApi/Controllers/Course/CourseController.cs
View file @
9d2a514f
...
@@ -261,7 +261,7 @@ namespace Edu.WebApi.Controllers.Course
...
@@ -261,7 +261,7 @@ namespace Edu.WebApi.Controllers.Course
RenewSlPrice
=
base
.
ParmJObj
.
GetDecimal
(
"RenewSlPrice"
),
RenewSlPrice
=
base
.
ParmJObj
.
GetDecimal
(
"RenewSlPrice"
),
Saleplat
=
base
.
ParmJObj
.
GetStringValue
(
"Saleplat"
),
Saleplat
=
base
.
ParmJObj
.
GetStringValue
(
"Saleplat"
),
IsKCourse
=
base
.
ParmJObj
.
GetInt
(
"IsKCourse"
),
IsKCourse
=
base
.
ParmJObj
.
GetInt
(
"IsKCourse"
),
ClassHours
=
base
.
ParmJObj
.
Get
Int
(
"ClassHours"
)
ClassHours
=
base
.
ParmJObj
.
Get
Decimal
(
"ClassHours"
)
};
};
extModel
.
CreateTime
=
DateTime
.
Now
;
extModel
.
CreateTime
=
DateTime
.
Now
;
extModel
.
CreateBy
=
base
.
UserInfo
.
Id
;
extModel
.
CreateBy
=
base
.
UserInfo
.
Id
;
...
...
Edu.WebApi/Controllers/StudyAbroad/StudyAbroadController.cs
View file @
9d2a514f
...
@@ -392,7 +392,7 @@ namespace Edu.WebApi.Controllers.StudyAbroad
...
@@ -392,7 +392,7 @@ namespace Edu.WebApi.Controllers.StudyAbroad
ManagerName
=
UserReidsCache
.
GetUserLoginInfo
(
extModel
.
ManagerId
)?.
AccountName
??
""
,
ManagerName
=
UserReidsCache
.
GetUserLoginInfo
(
extModel
.
ManagerId
)?.
AccountName
??
""
,
extModel
.
PreferentialList
,
extModel
.
PreferentialList
,
};
};
return
ApiResult
.
Success
(
data
:
extModel
);
return
ApiResult
.
Success
(
data
:
obj
);
}
}
/// <summary>
/// <summary>
...
...
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