Commit Graph

477 Commits

Author SHA1 Message Date
cheche
6ebaf58bdc Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-03-08 17:59:31 +08:00
cheche
d9b7e80dec fix 导优 2024-03-08 17:59:29 +08:00
96ed9e04ef fix tenantId null 问题 2024-03-08 17:07:07 +08:00
23cc2588a3 fix rebase配置问题 2024-03-08 16:48:32 +08:00
27663b4e53 fix 数据类型调整 2024-03-08 16:42:22 +08:00
cheche
e08d4dc3c3 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-03-08 16:24:54 +08:00
cheche
0c639deefb fix 导入优化 2024-03-08 16:24:52 +08:00
d2385a3f4f fix 配置错误 2024-03-08 15:15:32 +08:00
47c882f754 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-03-08 14:54:24 +08:00
cheche
62dbaada9d fix 批量导入修改 2024-03-08 14:49:47 +08:00
eca9ca3a44 feat ocelot 2024-03-08 14:48:41 +08:00
40dd39adc9 fix 控制自动生成表结构 2024-03-08 11:51:55 +08:00
c72e1197b4 fix appsettings 2024-03-08 11:37:51 +08:00
cheche
f93c7e11c6 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development 2024-03-08 11:36:40 +08:00
cheche
5315632977 fix 批量导入修改 2024-03-08 11:36:36 +08:00
2d731e49c4 Merge branch 'development' 2024-03-08 11:31:56 +08:00
4fa49efeac fix 权限分配tenantId错误问题 2024-03-08 10:30:29 +08:00
538fe7c4b4 fix 优化档案查询 2024-03-07 21:34:04 +08:00
990fc247bc fix type修改为设备类型 2024-03-07 17:26:46 +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
cheche
a1aa61b251 fix 设备任务分页优化 2024-03-07 10:51:28 +08:00
cheche
6a9400fb0a 解决balanceService冲突 2024-03-07 09:44:27 +08:00
cheche
224ddf1be5 feat 餐饮主页接口 2024-03-07 09:33:13 +08:00
a0505a1a93 fix 根据权限查询 2024-03-07 00:31:27 +08:00
20aa1b0815 fix 优化任务生成 2024-03-06 23:48:52 +08:00
3416b16e02 fix 档案组分配人员 2024-03-06 23:13:51 +08:00
83aa9cb954 fix 优化细节 2024-03-06 22:51:39 +08:00
04f20e7cf2 fix 唯一号处理 2024-03-06 22:36:02 +08:00
28390abaa5 fix tenantId手动添加 2024-03-06 22:19:05 +08:00
c0f1b15b10 fix 设备模板移除tenantId 2024-03-06 21:57:16 +08:00
14c63ead73 fix 优化查询判断 2024-03-06 21:40:34 +08:00
d3e0581963 fix 增加档案组分配检验 2024-03-06 21:30:31 +08:00
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