Commit Graph

319 Commits

Author SHA1 Message Date
f255a87138 fix 框架调整,优化数据返回 2024-02-23 16:20:24 +08:00
cheche
ef782d6892 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-02-23 15:23:47 +08:00
cheche
7fa18402d1 fix 获取最新版本路由 2024-02-23 15:23:16 +08:00
3e03b28a73 fix 增加保存餐次段 2024-02-23 15:20:44 +08:00
cheche
36188926d4 fix 修改下载链接域名 2024-02-23 15:19:16 +08:00
7c52b7fb1e fix 路由名称重复 2024-02-23 14:13:04 +08:00
7c0fa74767 fix 数据返回优化 2024-02-23 12:22:03 +08:00
b272373584 fix 营业点餐次修改 2024-02-23 12:12:30 +08:00
cheche
cbb26575ac fix 合并餐饮首页接口 2024-02-23 11:06:54 +08:00
cheche
e7a4075b78 fix 添加调用api权限 2024-02-23 10:09:22 +08:00
cheche
89f2f7b991 fix 修改文件上传大小限制 2024-02-23 09:29:10 +08:00
cheche
9f83188819 fix 修改apk大小 2024-02-22 19:15:47 +08:00
cheche
bbe5939887 fix xiugai 2024-02-22 18:30:58 +08:00
cheche
f3b17dc6b8 fix 删除url列 2024-02-22 18:25:19 +08:00
cheche
927dbcb47b Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-02-22 18:16:46 +08:00
cheche
cd5f7e115a fix 修改vername 2024-02-22 18:16:44 +08:00
83704bb017 fix dockerfile 2024-02-22 18:13:49 +08:00
4ee5703b65 fix 就餐增加权限控制 2024-02-22 18:12:28 +08:00
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