Commit Graph

707 Commits (08761f6349847d79554e6df2d2865657ce69230e)

Author SHA1 Message Date
jay 195ab6761f fix: 报警记录id类型 2023-06-18 21:30:57 +08:00
regan 832bdd3fcc Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5 2023-06-18 20:25:22 +08:00
regan ca8dd9a13f docs: 待优化项文档更新 2023-06-18 20:24:59 +08:00
xiwa 68dc41b4d1 Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5 2023-06-18 20:14:52 +08:00
xiwa 0ce0a704e8 fix:规则删除失败 2023-06-18 20:14:46 +08:00
jay fec41c85ed fix: 返回值拦截 2023-06-18 19:26:02 +08:00
jay a4b5604cee fix: 返回值拦截 2023-06-18 19:21:05 +08:00
jay 4b7f8ea0a8 Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5 2023-06-18 18:43:35 +08:00
jay bfd97831d6 fix: 修改角色状态 2023-06-18 18:36:28 +08:00
regan 7999679c55 faet: baetyl接口封装 2023-06-18 18:19:52 +08:00
xiwa 134442efc8 Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5 2023-06-18 14:35:05 +08:00
xiwa 1ef0ac88a0 fix:规则引擎 2023-06-18 14:34:59 +08:00
jay 2a26af2be1 fix: 删除角色部门 2023-06-18 12:02:08 +08:00
jay 983f29c4ea fix: OTA_ID类型 2023-06-17 22:21:35 +08:00
jay d746490c57 Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5 2023-06-17 22:13:45 +08:00
荭琪枫 3575e4d8cf add:添加ota下发 2023-06-17 22:15:29 +08:00
jay fe7bf483c2 fix: 无查询条件查询数据 2023-06-17 22:13:30 +08:00
xiwa d4e5c824a6 fix:物模型保存 2023-06-17 22:12:15 +08:00
jay 659336ab85 fix: 初始化数据 2023-06-17 21:50:31 +08:00
jay 046860fe31 fix: 设备添加成功返回false 2023-06-17 21:35:12 +08:00
荭琪枫 19fca28fa2 Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5 2023-06-17 21:01:14 +08:00
荭琪枫 e772f90e08 add:添加OTA上报记录结果并新增OTA上报结果查询 2023-06-17 21:00:55 +08:00
jay 64d0b1f7fc Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5 2023-06-17 20:57:07 +08:00
jay 8b55b19cba fix: 回滚mapstruct-plus版本 2023-06-17 20:56:52 +08:00
xiwa fd28cef2d3 Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5 2023-06-17 20:45:26 +08:00
xiwa 2b46269265 fix:菜单调整 2023-06-17 20:45:20 +08:00
jay fa795e7845 fix: 初始化菜单 2023-06-17 20:38:57 +08:00
jay 954f0cc188 chore: mapstruct-plus版本升级 2023-06-17 20:36:03 +08:00
regan c15c7a307d fix: 链路追踪id日志打印 2023-06-17 19:06:46 +08:00
regan d802d68aaa Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5 2023-06-17 17:45:35 +08:00
regan 12de304e78 fix: 打包插件统一 2023-06-17 17:45:22 +08:00
xiwa 5e84302179 fix:物模型转换修改 2023-06-17 17:27:20 +08:00
xiwa aabba71331 fix:产品模型 2023-06-17 15:03:22 +08:00
regan b7b6bc3997 fix: 告警列表 2023-06-17 14:56:53 +08:00
regan d7d67780c5 fix: 告警列表 2023-06-17 14:49:04 +08:00
regan f59dbb78e2 fix: 告警列表 2023-06-17 14:47:09 +08:00
regan 793bfe2459 fix: 告警列表 2023-06-17 14:46:35 +08:00
regan 646c5dd49d fix: 告警列表 2023-06-17 14:36:22 +08:00
regan 0f59c1f785 fix: 设备属性接口 2023-06-17 13:08:28 +08:00
regan ae776b7814 fix: 设备属性接口 2023-06-17 12:54:37 +08:00
regan fd799f331f fix: 设备属性接口 2023-06-17 12:40:52 +08:00
xiwa 90672fe6a9 fix:初始数据设备列表修改 2023-06-16 23:05:39 +08:00
xiwa 8c3950d563
update README.md.
Signed-off-by: xiwa <xw2sy@163.com>
2023-06-16 12:53:14 +00:00
tangfudong c2517075dd Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5 2023-06-16 19:14:35 +08:00
tangfudong c6f1e356b2 fix:消息列表联调完成 2023-06-16 19:13:47 +08:00
jay 03ab2263d9 fix: id类型 2023-06-16 19:13:45 +08:00
jay 4595f1f39a fix: 类型转化 2023-06-16 19:12:53 +08:00
jay 5864cf1dc2 Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5 2023-06-16 18:51:30 +08:00
jay a632d39658 refactor: 添加用户,修改权限 2023-06-16 18:51:17 +08:00
tangfudong 04505e3495 fix:通道配置和模板配置完成 2023-06-16 18:44:35 +08:00