Commit Graph

139 Commits

Author SHA1 Message Date
82f942ed13 fix role,user查看; 设备状态 2024-02-22 15:32:24 +08:00
2d1678de9f fix 作为考勤设备判断 2024-02-22 15:03:31 +08:00
a08b08fbc1 fix 设备,设备分组调整 2024-02-22 15:00:51 +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
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
732a477880 fix 处理部门树从00001000开始 2024-02-21 16:44:25 +08:00
cheche
39343ba5ed fix 修改考勤设备在线、离线及总数路由 2024-02-21 15:19:59 +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
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
28871aa450 fix 功能调整 2024-02-01 17:46:40 +08:00
cheche
2f5f6be7d7 fix 设备分页返回属性新增Type 2024-02-01 10:17:43 +08:00
cheche
b1927ef9ca fix 设备/组新城枚举及调整 2024-01-31 17:32:00 +08:00
cheche
0b02a95f66 fix 档案详情 2024-01-30 14:53:31 +08:00
cheche
025a05a533 fix 请求体枚举参数限定 2024-01-30 14:37:57 +08:00
cheche
71de7baac6 fix 考勤下发任务记录分页 2024-01-30 09:51:41 +08:00
cheche
600085a0bd Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-01-29 18:16:00 +08:00
cheche
9673f173b2 feat 记录查询接口 2024-01-29 18:15:48 +08:00
9638bf270a fix identity敏感信息开启 2024-01-29 10:37:13 +08:00
b69a170b96 fix 配置处理 2024-01-26 18:49:29 +08:00
1c295f50fb fix 重建dockerfile 2024-01-26 18:24:47 +08:00
05c2073ea7 fix 代码合并,minio上传文件 2024-01-26 18:22:57 +08:00
7ec29ab113 fix 档案增加搜索 2024-01-26 15:11:17 +08:00
55cce895c9 fix 优化查询null值,注释 2024-01-25 16:59:30 +08:00
54510f28ea fix 移除brand字段 2024-01-25 14:43:21 +08:00
5bd0cec44e fix 编译错误 2024-01-25 14:30:25 +08:00
e669134fea fix 单独的设备分页类型 2024-01-25 14:29:33 +08:00
4396d7a672 fix 注释表自动生成 2024-01-24 20:56:30 +08:00
51c80a242e fix 调试大华设备对接 2024-01-24 20:46:55 +08:00
cheche
a36ff46722 fix 根据营业点号获取餐次名称为null 2024-01-24 19:08:06 +08:00
0fa8cba30a fix 优化判断 2024-01-22 10:48:18 +08:00
e749a6cc14 fix 升级到0.5.2,优化任务生成 2024-01-22 09:45:39 +08:00
cheche
ce939b0a29 fix 更新Kurisu.AspNetCore (0.5.1) 2024-01-22 09:21:07 +08:00
6480501a03 fix 补充注释 2024-01-19 13:30:52 +08:00
ce8f64fee3 fix 优化下发创建 2024-01-18 19:00:05 +08:00
441b173469 fix 减少冗余字段,兼容userId 2024-01-18 17:23:20 +08:00
cheche
2000ea3a0e feat 批量获取人口post 2024-01-17 18:39:56 +08:00