Commit Graph

421 Commits

Author SHA1 Message Date
b6f02b433b fix 档案组分配人员触发任务下发 2024-03-06 20:55:20 +08:00
83a2bcd02a fix 设备任务下发调整 2024-03-06 20:37:55 +08:00
107b5b970f fix 编译错误 2024-03-06 19:43:43 +08:00
2e6602737a fix tenantId 2024-03-06 19:42:35 +08:00
21b7ec64b2 fix 默认值 2024-03-06 19:39:14 +08:00
64fbe4737d fix AbleSetNext值映射 2024-03-06 19:30:47 +08:00
9f771bc865 fix 优化细节和tenant问题 2024-03-06 19:22:14 +08:00
6352ffd9af fix 档案组分配人员控制 2024-03-06 17:34:14 +08:00
4bab1fd2fd fix ignoreTenant接口 2024-03-06 16:37:54 +08:00
cheche
060e408d1c Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-03-06 16:12:41 +08:00
cheche
2364b82540 fix 日志倒叙 2024-03-06 16:12:39 +08:00
973142db2f fix 更新获取请求日志 2024-03-06 16:11:12 +08:00
1f17e7a92b fix 移除逻辑删除字段 2024-03-06 16:05:11 +08:00
cheche
11690623a4 fix 修正语法错误 2024-03-06 14:05:36 +08:00
cheche
41d4807cca fix 修改营业点增加配置设备接口为post 2024-03-06 10:49:34 +08:00
cheche
ca239ce873 fix 修改点击关掉在职/离职报错 2024-03-06 10:40:59 +08:00
cheche
05369a691f feat 营业点增加配置设备接口 2024-03-06 10:23:55 +08:00
cheche
04ff6ae94a Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-03-06 09:25:39 +08:00
cheche
18a92b96d8 feat 消费机及离线设备详情 2024-03-06 09:25:34 +08:00
8157f0a01b fix 优化分组 2024-03-05 20:38:00 +08:00
eada9b6af9 feat 任务状态重置 2024-03-05 20:09:55 +08:00
9e2440fe77 fix 分页查询优化 2024-03-05 19:46:27 +08:00
4c959ccd40 fix 代码优化 2024-03-05 19:36:13 +08:00
22a1d9359d fix 增加索引,增加备注 2024-03-05 19:35:35 +08:00
778d100e72 feat 基地/租户tree 2024-03-05 19:35:03 +08:00
001f28c4c3 fix 返回Editable 2024-03-05 18:32:48 +08:00
5008f1dc6a fix 处理框架string null问题 2024-03-05 17:35:59 +08:00
6fbf517aa2 fix 编译错误 2024-03-05 17:07:57 +08:00
509662429b fix 移除无用接口 2024-03-05 17:06:12 +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
49dcf96bfc add 补充 2024-03-05 16:45:30 +08:00
888460ea99 fix 框架tenant问题;档案组和设备组特殊处理返回 2024-03-05 16:45:15 +08:00
cheche
40a0234bbf Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-03-05 16:03:59 +08:00
cheche
6f15149321 feat 营业点获取下面设备 2024-03-05 16:03:57 +08:00
c696f65481 fix 增加PCode条件 2024-03-05 15:53:40 +08:00
cheche
fede752f0f Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-03-05 15:45:24 +08:00
cheche
3de3fde888 fix 修改设备对应营业点 2024-03-05 15:45:21 +08:00
f6a155ae73 fix 优化细节 2024-03-05 15:30:44 +08:00
817eb9115a fix 系统分组生成调整 2024-03-05 15:29:25 +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
bb236be406 fix 修改api控制器名称 2024-03-01 15:16:09 +08:00
cheche
80088df845 fix 移动api日志位置 2024-03-01 13:51:26 +08:00
83d5e4f166 fix 分页倒排 2024-03-01 12:20:37 +08:00
0dc2192dad fix 可获取记录设备保存时候自动产生初始日志 2024-03-01 12:03:28 +08:00
cheche
dc1ba173d1 fix 修改GetShiftCode()空异常 2024-03-01 11:04:14 +08:00