Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
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
8timerv2
8timerapiv200
Commits
5b95a1a9
Commit
5b95a1a9
authored
4 years ago
by
lal
Committed by
chenzg
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
37bb9a15
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
src/main/java/cn/timer/api/bean/kqmk/KqglAssoOvertimeRulesM.java
+1
-1
src/main/java/cn/timer/api/controller/LoginController.java
+1
-1
No files found.
src/main/java/cn/timer/api/bean/kqmk/KqglAssoOvertimeRulesM.java
View file @
5b95a1a9
...
@@ -107,7 +107,7 @@ public class KqglAssoOvertimeRulesM extends Model<KqglAssoOvertimeRulesM> {
...
@@ -107,7 +107,7 @@ public class KqglAssoOvertimeRulesM extends Model<KqglAssoOvertimeRulesM> {
private
String
holidaysThree
;
private
String
holidaysThree
;
@ApiModelProperty
(
value
=
"创建时间 创建时间"
,
example
=
"101"
)
@ApiModelProperty
(
value
=
"创建时间 创建时间"
,
example
=
"101"
)
private
Integer
createTime
;
private
Long
createTime
;
@ApiModelProperty
(
value
=
"创建人员 创建人员"
,
example
=
"101"
)
@ApiModelProperty
(
value
=
"创建人员 创建人员"
,
example
=
"101"
)
private
Integer
createUserid
;
private
Integer
createUserid
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/LoginController.java
View file @
5b95a1a9
...
@@ -641,7 +641,7 @@ public class LoginController {
...
@@ -641,7 +641,7 @@ public class LoginController {
KqglAssoOvertimeRules
Rules
=
KqglAssoOvertimeRules
.
builder
().
build
();
KqglAssoOvertimeRules
Rules
=
KqglAssoOvertimeRules
.
builder
().
build
();
Rules
.
setOrgCode
(
qyzxEntInfoM
.
getId
());
Rules
.
setOrgCode
(
qyzxEntInfoM
.
getId
());
BeanUtil
.
copyProperties
(
jbgzdef
,
Rules
,
"orgCode"
);
BeanUtil
.
copyProperties
(
jbgzdef
,
Rules
,
"orgCode"
);
Rules
.
insert
();
//假期规则初始化
//假期规则初始化
String
current_time
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
).
format
(
new
Date
());
String
current_time
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
).
format
(
new
Date
());
...
...
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