Commit Graph

301 Commits

Author SHA1 Message Date
cheche
ada7fe99e4 解决redis配置冲突 2024-02-22 17:57:58 +08:00
cheche
fd5dda33ab fix 修改apk实体的name为string 2024-02-22 17:56:36 +08:00
0143b2aba1 fix 优化调整 2024-02-22 17:53:06 +08:00
4bd0c2403d fix 设备组数据展示,保存控制editable 2024-02-22 17:43:33 +08:00
78b92ab223 fix 配置tenant api 地址 2024-02-22 17:10:09 +08:00
0296f670e9 fix 恢复redis连接 2024-02-22 16:46:07 +08:00
e3710ad0a5 feat 批量上传人脸接口 2024-02-22 16:37:52 +08:00
77d3207bb4 fix 获取考勤人数 2024-02-22 16:37:35 +08:00
2a21e6bd5b fix 优化任务生成 2024-02-22 16:36:43 +08:00
cheche
f8e2ff4889 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-02-22 16:24:19 +08:00
cheche
d3c8c211bf feat 电子餐券申请/使用记录查询 2024-02-22 16:24:16 +08:00
f4acba8c6b fix 移除无用字段 2024-02-22 16:02:19 +08:00
82f942ed13 fix role,user查看; 设备状态 2024-02-22 15:32:24 +08:00
cheche
a197a0bfea Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-02-22 15:12:34 +08:00
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
5c2d40d180 fix 优化同步处理 2024-02-21 17:53:53 +08:00
9f16e24b9d fix 人员同步调整 2024-02-21 17:38:35 +08:00
df607a6c4f fix 岗位同步修改 2024-02-21 17:24:09 +08:00
64af61754a fix postition LANGU 字段类型 2024-02-21 17:03:04 +08:00
732a477880 fix 处理部门树从00001000开始 2024-02-21 16:44:25 +08:00
7fb913764e fix 机构数据同步处理 2024-02-21 16:25:37 +08:00
58b90947d2 fix 字段类型修改 2024-02-21 15:55:55 +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
01f3668879 fix 注释sql脚本生成 2024-02-21 10:39:12 +08:00
272e8db954 fix 更新数据库脚本 2024-02-20 19:01:40 +08:00
f3f62670b8 fix redis密码 2024-02-20 15:22:51 +08:00
56b6caf76e fix 生产环境配置 2024-02-20 15:13:20 +08:00
cheche
213c53839c fix 部门树分页添加no条件搜索 2024-02-20 11:15:23 +08:00
cheche
1f360c8005 feat 部门数分页 2024-02-20 11:07:04 +08:00