Commit Graph

Select branches

Hide Pull Requests

master

yuenan

Mono Color

• 83704bb017 fix dockerfile liguoyang 2024-02-22 18:13:49 +08:00
• 4ee5703b65 fix 就餐增加权限控制 liguoyang 2024-02-22 18:12:28 +08:00
• ada7fe99e4 解决redis配置冲突 cheche 2024-02-22 17:57:58 +08:00
• fd5dda33ab fix 修改apk实体的name为string cheche 2024-02-22 17:56:36 +08:00
• 0143b2aba1 fix 优化调整 liguoyang 2024-02-22 17:53:06 +08:00
• 4bd0c2403d fix 设备组数据展示,保存控制editable liguoyang 2024-02-22 17:43:33 +08:00
• 78b92ab223 fix 配置tenant api 地址 liguoyang 2024-02-22 17:10:09 +08:00
• 0296f670e9 fix 恢复redis连接 liguoyang 2024-02-22 16:46:07 +08:00
• e3710ad0a5 feat 批量上传人脸接口 liguoyang 2024-02-22 16:37:52 +08:00
• 77d3207bb4 fix 获取考勤人数 liguoyang 2024-02-22 16:37:35 +08:00
• 2a21e6bd5b fix 优化任务生成 liguoyang 2024-02-22 16:36:43 +08:00
• f8e2ff4889 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-02-22 16:24:19 +08:00
• d3c8c211bf feat 电子餐券申请/使用记录查询 cheche 2024-02-22 16:24:16 +08:00
• f4acba8c6b fix 移除无用字段 liguoyang 2024-02-22 16:02:19 +08:00
• 82f942ed13 fix role,user查看; 设备状态 liguoyang 2024-02-22 15:32:24 +08:00
• a197a0bfea Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-02-22 15:12:34 +08:00
• 40b8e1af68 feat 日/月消费走势接口 cheche 2024-02-22 15:12:31 +08:00
• 2d1678de9f fix 作为考勤设备判断 liguoyang 2024-02-22 15:03:31 +08:00
• a08b08fbc1 fix 设备,设备分组调整 liguoyang 2024-02-22 15:00:51 +08:00
• 9f5c239832 fix 考勤任务生成处理 liguoyang 2024-02-22 15:00:21 +08:00
• 1ccacdf04d fix 更新注释和role-list liguoyang 2024-02-22 14:46:43 +08:00
• 170b6a1202 feat 创建系统默认分组 liguoyang 2024-02-22 14:30:03 +08:00
• 9345cc6441 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-02-22 14:04:09 +08:00
• b5d6ec8366 feat 查询消费机总数、离线设备数量、营业点数量、可消费人数、人均日消费额 cheche 2024-02-22 14:04:01 +08:00
• e55a6793a7 fix 营业点类型枚举和考勤summary liguoyang 2024-02-22 14:01:19 +08:00
• 951e1659f9 feat 角色管理 liguoyang 2024-02-22 13:11:17 +08:00
• 8e43cf36e8 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-02-22 10:12:10 +08:00
• 6d2d62d628 feat 获取api日志 cheche 2024-02-22 10:12:04 +08:00
• 322430da70 fix 处理同步gainfo liguoyang 2024-02-21 19:27:39 +08:00
• 36824f0f57 fix 优化备注 liguoyang 2024-02-21 19:18:11 +08:00
• 67241be8e2 fix gainfosap同步 liguoyang 2024-02-21 19:09:34 +08:00
• bce8a2bab3 fix 调整为同步处理 liguoyang 2024-02-21 19:04:09 +08:00
• b4bf2848a3 fix log liguoyang 2024-02-21 18:59:16 +08:00
• 9cc9b76b56 fix 异步问题 liguoyang 2024-02-21 18:57:04 +08:00
• d2cf162694 fix 尝试处理iserviceprovider问题 liguoyang 2024-02-21 18:50:06 +08:00
• d5e5485c52 fix log异常 liguoyang 2024-02-21 18:39:04 +08:00
• fe4b7b0394 fix log chunk liguoyang 2024-02-21 18:35:45 +08:00
• 177b0862f2 fix 补充日志和去重逻辑 liguoyang 2024-02-21 18:29:57 +08:00
• a9c8ab7d00 fix 增加日志调试 liguoyang 2024-02-21 18:15:15 +08:00
• 7d20cf48df fix 配置处理 liguoyang 2024-02-21 18:02:07 +08:00
• db14eb4fe3 Merge branch 'development' liguoyang 2024-02-21 17:54:16 +08:00
• 5c2d40d180 fix 优化同步处理 liguoyang 2024-02-21 17:53:53 +08:00
• cec93dd2cd Merge branch 'development' liguoyang 2024-02-21 17:38:56 +08:00
• 9f16e24b9d fix 人员同步调整 liguoyang 2024-02-21 17:38:35 +08:00
• ca0bc3b87f Merge branch 'development' liguoyang 2024-02-21 17:24:44 +08:00
• df607a6c4f fix 岗位同步修改 liguoyang 2024-02-21 17:24:09 +08:00
• 972e86373f Merge branch 'development' liguoyang 2024-02-21 17:03:26 +08:00
• 64af61754a fix postition LANGU 字段类型 liguoyang 2024-02-21 17:03:04 +08:00
• e491491192 Merge branch 'development' liguoyang 2024-02-21 16:44:42 +08:00
• 732a477880 fix 处理部门树从00001000开始 liguoyang 2024-02-21 16:44:25 +08:00
• 82644f5e8a Merge branch 'development' liguoyang 2024-02-21 16:26:15 +08:00
• 7fb913764e fix 机构数据同步处理 liguoyang 2024-02-21 16:25:37 +08:00
• c92c43a86d Merge branch 'development' liguoyang 2024-02-21 15:56:50 +08:00
• 58b90947d2 fix 字段类型修改 liguoyang 2024-02-21 15:55:55 +08:00
• cae20563ae Merge branch 'development' liguoyang 2024-02-21 15:21:23 +08:00
• 4c77130a18 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-02-21 15:20:04 +08:00
• 39343ba5ed fix 修改考勤设备在线、离线及总数路由 cheche 2024-02-21 15:19:59 +08:00
• 495c2f9897 fix baseUrl和作用域 liguoyang 2024-02-21 15:16:44 +08:00
• 5b40cfbd39 fix sap-api凭证 liguoyang 2024-02-21 15:15:12 +08:00
• 0632bee180 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-02-21 14:59:33 +08:00
• ef60f1dffc feat 获取本基地管理员列表 cheche 2024-02-21 14:59:23 +08:00
• a46151abfd fix db setting liguoyang 2024-02-21 12:06:10 +08:00
• 849b7f98a4 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development liguoyang 2024-02-21 11:46:30 +08:00
• a2aa0de737 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development liguoyang 2024-02-21 11:46:25 +08:00
• 7f7afb251c fix 设备数据和人员数据修改 cheche 2024-02-21 11:44:55 +08:00
• 6e492595f8 feat 二级路由更改及设备人员数据 cheche 2024-02-21 11:09:38 +08:00
• 01f3668879 fix 注释sql脚本生成 liguoyang 2024-02-21 10:39:12 +08:00
• 272e8db954 fix 更新数据库脚本 liguoyang 2024-02-20 19:01:40 +08:00
• f3f62670b8 fix redis密码 liguoyang 2024-02-20 15:22:51 +08:00
• 56b6caf76e fix 生产环境配置 liguoyang 2024-02-20 15:13:20 +08:00
• 213c53839c fix 部门树分页添加no条件搜索 cheche 2024-02-20 11:15:23 +08:00
• 1f360c8005 feat 部门数分页 cheche 2024-02-20 11:07:04 +08:00
• 28871aa450 fix 功能调整 liguoyang 2024-02-01 17:46:40 +08:00
• 2f5f6be7d7 fix 设备分页返回属性新增Type cheche 2024-02-01 10:17:43 +08:00
• 96cdc5a1ef fix 修改doors数量 cheche 2024-02-01 09:53:14 +08:00
• b1927ef9ca fix 设备/组新城枚举及调整 cheche 2024-01-31 17:32:00 +08:00
• 64c113cd6a fix 统计结果修正 cheche 2024-01-31 14:07:02 +08:00
• 21bd830002 fix 枚举调整 cheche 2024-01-31 11:02:41 +08:00
• 29944fb5d3 fix 考勤记录 cheche 2024-01-30 17:40:31 +08:00
• bf901df7d6 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-01-30 17:31:16 +08:00
• 4e88466bff feat 设备和设备组功能属性 cheche 2024-01-30 17:31:12 +08:00
• 2a432088aa fix hangfire切换到redis liguoyang 2024-01-30 17:19:00 +08:00
• 7e90058587 fix ping db liguoyang 2024-01-30 17:04:56 +08:00
• 0b02a95f66 fix 档案详情 cheche 2024-01-30 14:53:31 +08:00
• 025a05a533 fix 请求体枚举参数限定 cheche 2024-01-30 14:37:57 +08:00
• c17a29db27 fix 本地上传调整 cheche 2024-01-30 14:14:17 +08:00
• 4044f8fcbf fix 考勤下发展示状态修改 cheche 2024-01-30 13:04:15 +08:00
• 4fddd284a6 fix 上传路由更改 cheche 2024-01-30 11:43:12 +08:00
• 71de7baac6 fix 考勤下发任务记录分页 cheche 2024-01-30 09:51:41 +08:00
• 600085a0bd Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development cheche 2024-01-29 18:16:00 +08:00
• 9673f173b2 feat 记录查询接口 cheche 2024-01-29 18:15:48 +08:00
• 9638bf270a fix identity敏感信息开启 liguoyang 2024-01-29 10:37:13 +08:00
• 4cf0b626e5 fix 处理描述 liguoyang 2024-01-26 19:07:48 +08:00
• 61c7116608 fix 数据库域问题 liguoyang 2024-01-26 19:01:01 +08:00
• b69a170b96 fix 配置处理 liguoyang 2024-01-26 18:49:29 +08:00
• 522ac9b05e fix 处理名称展示 liguoyang 2024-01-26 18:33:09 +08:00
• 1c295f50fb fix 重建dockerfile liguoyang 2024-01-26 18:24:47 +08:00
• 05c2073ea7 fix 代码合并,minio上传文件 liguoyang 2024-01-26 18:22:57 +08:00
• f83afdb4d0 fix 查询分页 cheche 2024-01-26 17:40:23 +08:00
• 40c655c9ff fix 调整 cheche 2024-01-26 15:35:25 +08:00