Commit Graph

518 Commits

Author SHA1 Message Date
cheche
1dbc1459ea Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-03-12 11:08:30 +08:00
cheche
e7aa353dce fix 营业点配置设备优化 2024-03-12 11:08:28 +08:00
f7f6a8686f Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-03-12 10:51:23 +08:00
a5f80a0ef4 fix 统计人数调整,移除无用接口 2024-03-12 10:51:19 +08:00
cheche
f53ca84776 fix 营业点配置设备位置移动 2024-03-12 10:51:10 +08:00
cheche
7bf97dbe5e fix 根据档案号 设备组查询设备优化 2024-03-12 10:34:31 +08:00
cheche
15f89a82a2 fix 字段优化 2024-03-12 09:24:53 +08:00
cheche
5684078071 feat 获取用户所有设备权限 2024-03-11 18:37:42 +08:00
cheche
31b11bdcd3 fix 消费记录根据状态筛选 2024-03-11 18:19:28 +08:00
59122c408f fix 根据档案号,设备组查询设备 2024-03-11 18:04:00 +08:00
cheche
90e5728fd3 feat aa 2024-03-11 17:48:47 +08:00
fff0928a86 fix 调整用户对应营业点处理 2024-03-11 16:31:26 +08:00
cheche
17aef775c3 feat 根据用户查看餐饮点 2024-03-11 16:12:52 +08:00
cheche
12b577e0d7 fix 档案详情优化 2024-03-11 14:33:48 +08:00
cheche
400ea0152c 考勤-记录查询,列表字段修改 2024-03-11 11:47:59 +08:00
bacadbe014 Merge branch 'master' into development 2024-03-11 11:36:21 +08:00
f56d1129c1 fix 优化注释, 优化face通用字段 2024-03-11 11:33:13 +08:00
cheche
3b4b837994 fix 金额变正新增设备名称 2024-03-11 10:31:59 +08:00
c4bb884d48 fix job 2024-03-10 16:19:09 +08:00
72b25c7095 fix 自动创建就餐人员 2024-03-10 13:55:37 +08:00
53d70cc136 fix 数据问题 2024-03-10 12:35:57 +08:00
41a956f1f6 fix 设备记录上传分页type区分 2024-03-10 11:57:48 +08:00
ee2881742b fix 设备查询优化 2024-03-10 11:49:42 +08:00
64a63e2e49 feat 同步账号 2024-03-10 00:55:51 +08:00
4e0485d51f fix 模板编辑控制 2024-03-10 00:55:23 +08:00
72ad6e7d23 fix job 2024-03-09 20:13:49 +08:00
7ef1434cff fix 人员更新获取code 2024-03-09 19:37:31 +08:00
33327718d9 fix 设备上传记录类型 2024-03-09 19:15:00 +08:00
500a972b70 fix job 2024-03-09 18:39:43 +08:00
3fb820bd2d fix 人员同步,下发任务创建 2024-03-09 18:03:33 +08:00
3bf767281e fix 上传记录使用工号 2024-03-09 16:00:09 +08:00
82b712da53 fix 获取我的厂区处理 2024-03-09 15:54:10 +08:00
ee451d25c7 fix 配置文件key 2024-03-09 15:09:11 +08:00
d9e9856eab fix job 2024-03-09 15:04:31 +08:00
e5a0df385d fix 匹配失败获取中文 2024-03-09 14:28:29 +08:00
6bb35017ae fix 处理前端冗余数据 2024-03-09 14:28:14 +08:00
fa408bdcab fix 优化考勤上传 2024-03-09 13:53:12 +08:00
f9a7152c2b fix 优化考勤记录上传 2024-03-09 13:17:40 +08:00
553332e204 fix 集成job 2024-03-09 12:18:35 +08:00
bbd7659320 fix 同步任务调整 2024-03-09 12:13:11 +08:00
cheche
07d77f1070 feat 门禁首页数据 2024-03-08 19:03:57 +08:00
cheche
6ebaf58bdc Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-03-08 17:59:31 +08:00
cheche
d9b7e80dec fix 导优 2024-03-08 17:59:29 +08:00
96ed9e04ef fix tenantId null 问题 2024-03-08 17:07:07 +08:00
23cc2588a3 fix rebase配置问题 2024-03-08 16:48:32 +08:00
27663b4e53 fix 数据类型调整 2024-03-08 16:42:22 +08:00
cheche
e08d4dc3c3 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-03-08 16:24:54 +08:00
cheche
0c639deefb fix 导入优化 2024-03-08 16:24:52 +08:00
d2385a3f4f fix 配置错误 2024-03-08 15:15:32 +08:00
47c882f754 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-03-08 14:54:24 +08:00