Commit Graph

116 Commits

Author SHA1 Message Date
cheche
cd2dedc4f4 fix 取消device字段 2024-01-12 10:25:41 +08:00
cheche
43a13a137f Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-01-12 10:05:49 +08:00
cheche
8158951574 fix 添加设备类型和使用场景字段 2024-01-12 10:05:44 +08:00
f888361ee0 add 补充缺失文件 2024-01-11 19:43:12 +08:00
15e90d4d16 feat 人脸上传,内部支持客户端授权 2024-01-11 19:38:23 +08:00
d35b0043c3 fix 查询根据成本日期 2024-01-11 18:21:53 +08:00
cheche
9a5d9ecd4f fix CanteenSettingItemEnumType参数校验异常信息修正 2024-01-11 18:18:51 +08:00
cheche
1133de5850 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-01-11 18:08:24 +08:00
cheche
3f91c6109b fix CanteenSettingItemEnumType参数校验 2024-01-11 18:08:14 +08:00
0ad79dbb23 fix FromQuery 2024-01-11 16:39:31 +08:00
e03cb26174 fix userId --> userNo 2024-01-11 16:37:17 +08:00
5d1b3ad0f7 feat 设备考勤记录考勤上传 2024-01-11 16:31:23 +08:00
353844f348 feat 当前人员的消费记录 2024-01-11 16:06:02 +08:00
0ac04b0d2d fix 查询错误 2024-01-11 15:54:30 +08:00
6af019485d fix 字段修改,消费记录设备查询增加日期 2024-01-11 15:22:30 +08:00
212aa2b65d feat 设备获取消费记录 2024-01-11 15:06:07 +08:00
bfecdacb76 fix 取消匿名访问 2024-01-11 14:49:31 +08:00
1e98d9816a fix 字段名称,消费金额,实体注解 2024-01-11 14:26:52 +08:00
cheche
7aa907a049 合并今日消费记录冲突 2024-01-11 13:58:40 +08:00
cheche
b278884fcf fix 当天消费记录修正 2024-01-11 13:55:22 +08:00
16813c10f4 fix 优化消费代码处理 2024-01-11 11:53:26 +08:00
8c5819b18b fix 实体修改 2024-01-11 10:28:34 +08:00
34073e0db0 feat 设备上传记录 2024-01-11 10:28:11 +08:00
026fd7b18a fix todo 2024-01-10 19:10:45 +08:00
1738e52d8d fix 区间判断临时处理 2024-01-10 19:10:38 +08:00
3e5e9e4d0a fix 返回激活码 2024-01-10 18:02:39 +08:00
46b0965fd9 fix 基础字段处理 2024-01-10 17:37:54 +08:00
54835e6cae fix 设备注册自动新增 2024-01-10 17:33:27 +08:00
cheche
2e51a13c3d Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-01-10 17:13:30 +08:00
cheche
e7e7e78fd5 fix 订单有效 2024-01-10 17:13:24 +08:00
c9c2de80b7 fix 获取餐别增加基地信息 2024-01-10 17:11:36 +08:00
5915264df9 fix 设备对接接口忽略tenant 2024-01-10 16:53:47 +08:00
e596367222 fix 取消获取餐别授权 2024-01-10 16:43:54 +08:00
cheche
15dfaf48dd Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-01-10 16:41:05 +08:00
a23058b239 fix 取消授权 2024-01-10 16:40:52 +08:00
cheche
97f9d94846 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-01-10 16:39:51 +08:00
5e9d4ac2a6 fix 调整消费处理,配置文件显示sql 2024-01-10 16:39:12 +08:00
cheche
be88816918 合并 2024-01-10 16:24:00 +08:00
cheche
8ae0efe249 fix 调整 2024-01-10 16:23:20 +08:00
7c242370fc fix 注释,下发任务状态分页 2024-01-10 16:13:24 +08:00
8dba9e9a3a feat 获取当前人员信息 2024-01-10 14:51:38 +08:00
be581e43e3 add 档案增加身份认证用户ID 2024-01-10 13:35:28 +08:00
cd31e3fc58 fix 人事范围调用处理 2024-01-10 11:44:59 +08:00
cheche
21e945727b fix appsetting 2024-01-10 11:31:09 +08:00
cheche
4a969f586a Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-01-10 11:21:24 +08:00
407d3fbfd4 fix identity tables 2024-01-10 11:15:41 +08:00
cheche
8fe4005ae7 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-01-10 11:09:18 +08:00
cheche
0e45532a01 fix 订餐测试 2024-01-10 11:09:00 +08:00
76558e2f0a feat 升级版本, 设备权限 2024-01-10 11:06:15 +08:00
4b7a0f8682 fix 基础数据代码调整 2024-01-09 17:56:24 +08:00