|
|
e78ab0baea
|
fix 增加权限控制
|
2024-03-19 12:07:05 +08:00 |
|
|
|
793a3325f2
|
Squashed commit of the following:
commit d4ab7d407a141b80024f85eeaab0062bea016051
Author: liguoyang <Ligy.97@foxmail.com>
Date: Tue Mar 19 10:23:30 2024 +0800
merge error
commit 6204fa4ed15e0be303f7eb62307476725b8e7e36
Merge: 7290f0b aaeacf4
Author: liguoyang <Ligy.97@foxmail.com>
Date: Tue Mar 19 10:19:41 2024 +0800
Merge branch 'feat-PlacePermission' of https://git.dlhis.com/liguoyang/jinko.yikatong into feat-PlacePermission
commit 7290f0bd822c0e2bd957908fd58f6e99f22ad46b
Author: cheche <717840555@qq.com>
Date: Tue Mar 12 15:05:28 2024 +0800
fix 获取用户权限设备 优化
commit 41b94fa3a9596a38cda1b4bf4f345ce13fe5677a
Author: cheche <717840555@qq.com>
Date: Tue Mar 12 13:13:23 2024 +0800
fix 第一
commit aaeacf4ffa778eb6a6104e2349357644d038151b
Author: cheche <717840555@qq.com>
Date: Tue Mar 12 15:05:28 2024 +0800
fix 获取用户权限设备 优化
commit 9e6099c52d0318cba35e7c082cb4d3085b46b0fa
Author: cheche <717840555@qq.com>
Date: Tue Mar 12 14:00:53 2024 +0800
fix 营业点配置权限
commit b4565e34f48da0e5ef1d3dffa59d0ccf0d950920
Author: cheche <717840555@qq.com>
Date: Tue Mar 12 13:13:23 2024 +0800
fix 第一
|
2024-03-19 12:07:05 +08:00 |
|
|
|
3005443392
|
feat 菜品/菜单配置
|
2024-03-19 12:06:26 +08:00 |
|
|
|
4825648e41
|
fix 按基地分配获取值错误
|
2024-03-19 12:06:26 +08:00 |
|
|
|
ccf8a88a9b
|
fix 调整为调度执行
|
2024-03-14 21:59:32 +08:00 |
|
|
|
d3c1b45cf9
|
fix 取消处理代码位置
|
2024-03-14 21:29:20 +08:00 |
|
|
|
f2de9a6526
|
fix 数据获取需要比较时间
|
2024-03-14 21:08:28 +08:00 |
|
|
|
62d54c1f70
|
fix 逻辑优化
|
2024-03-14 21:04:45 +08:00 |
|
|
|
b763e74c12
|
fix 判断逻辑取反
|
2024-03-14 20:56:37 +08:00 |
|
|
|
7da5fdcb2f
|
fix 删除任务设置所有为取消判断
|
2024-03-14 20:53:56 +08:00 |
|
|
|
7a6bedf3f4
|
fix 优化任务状态
|
2024-03-14 20:36:14 +08:00 |
|
|
|
2cdba175bd
|
fix 优化唯一编码更新问题
|
2024-03-14 18:50:59 +08:00 |
|
|
|
a5f80a0ef4
|
fix 统计人数调整,移除无用接口
|
2024-03-12 10:51:19 +08:00 |
|
|
|
fff0928a86
|
fix 调整用户对应营业点处理
|
2024-03-11 16:31:26 +08:00 |
|
|
|
f56d1129c1
|
fix 优化注释, 优化face通用字段
|
2024-03-11 11:33:13 +08:00 |
|
|
|
53d70cc136
|
fix 数据问题
|
2024-03-10 12:35:57 +08:00 |
|
|
|
ee2881742b
|
fix 设备查询优化
|
2024-03-10 11:49:42 +08:00 |
|
|
|
4e0485d51f
|
fix 模板编辑控制
|
2024-03-10 00:55:23 +08:00 |
|
|
|
3fb820bd2d
|
fix 人员同步,下发任务创建
|
2024-03-09 18:03:33 +08:00 |
|
cheche
|
d9b7e80dec
|
fix 导优
|
2024-03-08 17:59:29 +08:00 |
|
cheche
|
0c639deefb
|
fix 导入优化
|
2024-03-08 16:24:52 +08:00 |
|
cheche
|
62dbaada9d
|
fix 批量导入修改
|
2024-03-08 14:49:47 +08:00 |
|
|
|
4fa49efeac
|
fix 权限分配tenantId错误问题
|
2024-03-08 10:30:29 +08:00 |
|
cheche
|
cd0561a122
|
Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development
|
2024-03-07 16:45:36 +08:00 |
|
cheche
|
ff15ae9176
|
feat 设备批量导入
|
2024-03-07 16:45:31 +08:00 |
|
|
|
5b38f09a36
|
fix unique为null问题
|
2024-03-07 15:31:20 +08:00 |
|
|
|
1de6bc6c0f
|
fix 组织架构树调整
|
2024-03-07 15:17:40 +08:00 |
|
cheche
|
12215fdfd7
|
fix 设备模板保存优化
|
2024-03-07 11:10:46 +08:00 |
|
|
|
20aa1b0815
|
fix 优化任务生成
|
2024-03-06 23:48:52 +08:00 |
|
|
|
04f20e7cf2
|
fix 唯一号处理
|
2024-03-06 22:36:02 +08:00 |
|
|
|
28390abaa5
|
fix tenantId手动添加
|
2024-03-06 22:19:05 +08:00 |
|
|
|
14c63ead73
|
fix 优化查询判断
|
2024-03-06 21:40:34 +08:00 |
|
|
|
83a2bcd02a
|
fix 设备任务下发调整
|
2024-03-06 20:37:55 +08:00 |
|
|
|
2e6602737a
|
fix tenantId
|
2024-03-06 19:42:35 +08:00 |
|
|
|
64fbe4737d
|
fix AbleSetNext值映射
|
2024-03-06 19:30:47 +08:00 |
|
|
|
9f771bc865
|
fix 优化细节和tenant问题
|
2024-03-06 19:22:14 +08:00 |
|
|
|
4bab1fd2fd
|
fix ignoreTenant接口
|
2024-03-06 16:37:54 +08:00 |
|
cheche
|
11690623a4
|
fix 修正语法错误
|
2024-03-06 14:05:36 +08:00 |
|
|
|
8157f0a01b
|
fix 优化分组
|
2024-03-05 20:38:00 +08:00 |
|
|
|
4c959ccd40
|
fix 代码优化
|
2024-03-05 19:36:13 +08:00 |
|
cheche
|
af4a8839b7
|
Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development
|
2024-03-05 16:58:50 +08:00 |
|
cheche
|
ae29ddee87
|
fix 修改营业点分页模糊搜索条件
|
2024-03-05 16:58:46 +08:00 |
|
|
|
888460ea99
|
fix 框架tenant问题;档案组和设备组特殊处理返回
|
2024-03-05 16:45:15 +08:00 |
|
cheche
|
3de3fde888
|
fix 修改设备对应营业点
|
2024-03-05 15:45:21 +08:00 |
|
cheche
|
ec54d9ddbb
|
fix 逻辑修正
|
2024-03-05 12:13:47 +08:00 |
|
cheche
|
6bdcb9124f
|
Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development
|
2024-03-05 10:16:20 +08:00 |
|
cheche
|
d280d035e2
|
fix 离线判断
|
2024-03-05 10:16:15 +08:00 |
|
|
|
fde0c2394e
|
fix 优化细节
|
2024-03-05 10:03:47 +08:00 |
|
cheche
|
640143eb6b
|
fix 修正离线设备判断逻辑
|
2024-03-04 13:56:30 +08:00 |
|
cheche
|
80088df845
|
fix 移动api日志位置
|
2024-03-01 13:51:26 +08:00 |
|
