abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
ryoeiken 2021-01-22 17:02:11 +08:00
commit 711856a329
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java
View File

@ -574,7 +574,7 @@ public class ClientController extends BaseController {
DinnerTypeUtils.DinnerType dinnerType = DinnerTypeUtils.getInstance(iFtConfigDaoService).getDinnerType(); DinnerTypeUtils.DinnerType dinnerType = DinnerTypeUtils.getInstance(iFtConfigDaoService).getDinnerType();
System.out.println(request); System.out.println(request);
if (dinnerType == DinnerTypeUtils.DinnerType.notMatch) { if (dinnerType == DinnerTypeUtils.DinnerType.notMatch) {
log.info("data : {} ", request); log.info("未到用餐时间人脸记录 : {} ", request);
return request.toJSONString(); return request.toJSONString();
} }
@ -590,6 +590,7 @@ public class ClientController extends BaseController {
return "该人脸识别设备已失效"; return "该人脸识别设备已失效";
} }
log.info("用餐时人脸记录 : {} ", info);
// 是否有该员工 // 是否有该员工
FtStaffInfoDao staffInfoDao = staffInfoDaoService.inStaff(personId); FtStaffInfoDao staffInfoDao = staffInfoDaoService.inStaff(personId);