From 5b95a1a9cd2cf4cacde0fcb3a4a6f5f79de7e45d Mon Sep 17 00:00:00 2001
From: lal <lalqqhy@163.com>
Date: Mon, 6 Jul 2020 10:05:18 +0800
Subject: [PATCH] 提交
---
src/main/java/cn/timer/api/bean/kqmk/KqglAssoOvertimeRulesM.java | 2 +-
src/main/java/cn/timer/api/controller/LoginController.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cn/timer/api/bean/kqmk/KqglAssoOvertimeRulesM.java b/src/main/java/cn/timer/api/bean/kqmk/KqglAssoOvertimeRulesM.java
index 5624626..f498b93 100644
--- a/src/main/java/cn/timer/api/bean/kqmk/KqglAssoOvertimeRulesM.java
+++ b/src/main/java/cn/timer/api/bean/kqmk/KqglAssoOvertimeRulesM.java
@@ -107,7 +107,7 @@ public class KqglAssoOvertimeRulesM extends Model<KqglAssoOvertimeRulesM> {
private String holidaysThree;
@ApiModelProperty(value = "创建时间 创建时间", example = "101")
- private Integer createTime;
+ private Long createTime;
@ApiModelProperty(value = "创建人员 创建人员", example = "101")
private Integer createUserid;
diff --git a/src/main/java/cn/timer/api/controller/LoginController.java b/src/main/java/cn/timer/api/controller/LoginController.java
index 2e1ec60..7d94ac1 100644
--- a/src/main/java/cn/timer/api/controller/LoginController.java
+++ b/src/main/java/cn/timer/api/controller/LoginController.java
@@ -641,7 +641,7 @@ public class LoginController {
KqglAssoOvertimeRules Rules = KqglAssoOvertimeRules.builder().build();
Rules.setOrgCode(qyzxEntInfoM.getId());
BeanUtil.copyProperties(jbgzdef, Rules , "orgCode");
-
+ Rules.insert();
//假期规则初始化
String current_time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
--
libgit2 0.26.0