Commit Graph

2511 Commits

Author SHA1 Message Date
cheche
40b8e1af68 feat 日/月消费走势接口 2024-02-22 15:12:31 +08:00
2d1678de9f fix 作为考勤设备判断 2024-02-22 15:03:31 +08:00
a08b08fbc1 fix 设备,设备分组调整 2024-02-22 15:00:51 +08:00
9f5c239832 fix 考勤任务生成处理 2024-02-22 15:00:21 +08:00
1ccacdf04d fix 更新注释和role-list 2024-02-22 14:46:43 +08:00
170b6a1202 feat 创建系统默认分组 2024-02-22 14:30:03 +08:00
cheche
9345cc6441 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-02-22 14:04:09 +08:00
cheche
b5d6ec8366 feat 查询消费机总数、离线设备数量、营业点数量、可消费人数、人均日消费额 2024-02-22 14:04:01 +08:00
e55a6793a7 fix 营业点类型枚举和考勤summary 2024-02-22 14:01:19 +08:00
951e1659f9 feat 角色管理 2024-02-22 13:11:17 +08:00
cheche
8e43cf36e8 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-02-22 10:12:10 +08:00
cheche
6d2d62d628 feat 获取api日志 2024-02-22 10:12:04 +08:00
322430da70 fix 处理同步gainfo 2024-02-21 19:27:39 +08:00
36824f0f57 fix 优化备注 2024-02-21 19:18:11 +08:00
67241be8e2 fix gainfosap同步 2024-02-21 19:09:34 +08:00
bce8a2bab3 fix 调整为同步处理 2024-02-21 19:04:09 +08:00
b4bf2848a3 fix log 2024-02-21 18:59:16 +08:00
9cc9b76b56 fix 异步问题 2024-02-21 18:57:04 +08:00
d2cf162694 fix 尝试处理iserviceprovider问题 2024-02-21 18:50:06 +08:00
d5e5485c52 fix log异常 2024-02-21 18:39:04 +08:00
fe4b7b0394 fix log chunk 2024-02-21 18:35:45 +08:00
177b0862f2 fix 补充日志和去重逻辑 2024-02-21 18:29:57 +08:00
a9c8ab7d00 fix 增加日志调试 2024-02-21 18:15:15 +08:00
7d20cf48df fix 配置处理 2024-02-21 18:02:07 +08:00
db14eb4fe3 Merge branch 'development' 2024-02-21 17:54:16 +08:00
5c2d40d180 fix 优化同步处理 2024-02-21 17:53:53 +08:00
cec93dd2cd Merge branch 'development' 2024-02-21 17:38:56 +08:00
9f16e24b9d fix 人员同步调整 2024-02-21 17:38:35 +08:00
ca0bc3b87f Merge branch 'development' 2024-02-21 17:24:44 +08:00
df607a6c4f fix 岗位同步修改 2024-02-21 17:24:09 +08:00
972e86373f Merge branch 'development' 2024-02-21 17:03:26 +08:00
64af61754a fix postition LANGU 字段类型 2024-02-21 17:03:04 +08:00
e491491192 Merge branch 'development' 2024-02-21 16:44:42 +08:00
732a477880 fix 处理部门树从00001000开始 2024-02-21 16:44:25 +08:00
82644f5e8a Merge branch 'development' 2024-02-21 16:26:15 +08:00
7fb913764e fix 机构数据同步处理 2024-02-21 16:25:37 +08:00
c92c43a86d Merge branch 'development' 2024-02-21 15:56:50 +08:00
58b90947d2 fix 字段类型修改 2024-02-21 15:55:55 +08:00
cae20563ae Merge branch 'development' 2024-02-21 15:21:23 +08:00
cheche
4c77130a18 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-02-21 15:20:04 +08:00
cheche
39343ba5ed fix 修改考勤设备在线、离线及总数路由 2024-02-21 15:19:59 +08:00
495c2f9897 fix baseUrl和作用域 2024-02-21 15:16:44 +08:00
5b40cfbd39 fix sap-api凭证 2024-02-21 15:15:12 +08:00
cheche
0632bee180 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-02-21 14:59:33 +08:00
cheche
ef60f1dffc feat 获取本基地管理员列表 2024-02-21 14:59:23 +08:00
a46151abfd fix db setting 2024-02-21 12:06:10 +08:00
849b7f98a4 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-02-21 11:46:30 +08:00
a2aa0de737 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-02-21 11:46:25 +08:00
cheche
7f7afb251c fix 设备数据和人员数据修改 2024-02-21 11:44:55 +08:00
cheche
6e492595f8 feat 二级路由更改及设备人员数据 2024-02-21 11:09:38 +08:00