From aa8ecde02d63168e11cdd693c84cd4de5fe2e04e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 17 May 2021 20:26:25 +0800
Subject: [PATCH] 1.考勤打卡接口修改，根据坐标判断是否在多边形区域内 2.考勤打卡接口修改，根据打卡时间判断打卡的状态

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/security/controller/SecurityController.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/security/controller/SecurityController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/security/controller/SecurityController.java
index b00ff3f..8ee8ad7 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/security/controller/SecurityController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/security/controller/SecurityController.java
@@ -37,6 +37,7 @@
 import javax.validation.Valid;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 
 /**
  *  控制器
@@ -81,7 +82,7 @@
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入security")
-	public R<IPage<SecurityVO>> page(SecurityVO security, Query query) {
+	public R<IPage<SecurityVO>> page(Security security, Query query) {
 		IPage<SecurityVO> pages = securityService.selectSecurityPage(Condition.getPage(query), security);
 		return R.data(pages);
 	}

--
Gitblit v1.9.3