common

log/common.log

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 2018/09/17 00:23:51 [E] 查询 Token 失败: Error 1146: Table 'spaceofcheng.sys_token_log' doesn't exist
 2018/09/17 00:23:51 [E] 查询 Token 失败: Error 1146: Table 'spaceofcheng.sys_token_log' doesn't exist
 2018/09/17 00:23:52 [E] 入库 Token 失败: Error 1146: Table 'spaceofcheng.sys_token_log' doesn't exist
@@ -512,7 +511,6 @@
 2018/09/19 14:28:44.088 [E]  体检设备名称不能为空！
 2018/09/19 14:31:22.383 [E]  体检设备名称不能为空！
 2018/09/19 14:31:29.015 [E]  体检设备名称不能为空！
-=======
 2018/09/19 10:11:21 [E] 获取人员信息失败: 当前用户没有权限查看用户信息
 2018/09/19 10:56:30 [E] 获取课程信息失败: Error 1052: Column 'org_id' in where clause is ambiguous
 2018/09/19 10:56:35 [E] 获取课程信息失败: Error 1052: Column 'org_id' in where clause is ambiguous
@@ -525,7 +523,6 @@
 2018/09/19 14:00:13 [E] 获取人员信息失败: 获取人员信息失败
 2018/09/19 14:00:18 [E] 获取发送卡信息失败: Error 1054: Unknown column 'serial_code' in 'field list'
 2018/09/19 14:00:18 [E] 获取人员信息失败: 获取人员信息失败
->>>>>>> 9dc1726096881bd3db4de91f5caf81c487d15e1b
 2018/09/19 16:20:17.097 [E]  更新 Token 过期失败: Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
 2018/09/19 16:21:17.206 [E]  更新 Token 过期失败: Error 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
 2018/09/19 16:52:44.367 [E]  用户没有设置默认案场