Commit Graph

979 Commits (49aec5df04b4a3bd1f57065e9cd699311a3bccd2)

Author SHA1 Message Date
jay 256d436329 Merge branch 'feature_V0.4.5_gencode' into dev-V0.4.5 2023-06-24 21:03:06 +08:00
jay 4fde0db036 fix: h2代码生成器 2023-06-24 21:02:25 +08:00
jay 86584d1fa3 fix: 代码生成器 2023-06-24 18:29:04 +08:00
荭琪枫 f65fb9a10d add upload 2023-06-23 17:37:10 +08:00
jay 9f028aa476 fix: 代码生成器 2023-06-22 17:13:12 +08:00
xiwa a2dcfe4de5 fix:延时任务和虚拟设备 2023-06-22 09:18:36 +08:00
tangfudong 0994c7f1c9 fix:物模型型号配置添加删除接口 2023-06-21 17:29:25 +08:00
tangfudong eb5c8c2872 fix:个人信息中心联调完成 2023-06-21 11:45:05 +08:00
jay 6c92bc79e6 Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5 2023-06-21 11:25:18 +08:00
jay f652bec9b4 feat: 添加清理数据脚本 2023-06-21 11:25:05 +08:00
xiwa 1884459744 fix:定时任务 2023-06-21 01:11:33 +08:00
荭琪枫 918370e054 优化otaId 2023-06-20 23:03:53 +08:00
tangfudong aebad31fa3 Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5 2023-06-20 17:58:14 +08:00
tangfudong 236d459dde fix:用户新增默认设置用户类型 2023-06-20 17:56:55 +08:00
jay b9f99e8070 revert: mapstruct-plus版本 2023-06-20 17:52:48 +08:00
jay cb89451043 Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5 2023-06-20 17:50:10 +08:00
jay 8a0ac998c4 fix: mapstruct-plus版本 2023-06-20 17:49:55 +08:00
regan 6f33e020da fix: RuleLogBoAutoMapper 2023-06-19 20:44:09 +08:00
jay 4659484e63 fix: 忽略设备权限校验 2023-06-19 14:53:49 +08:00
jay 0a31f020f2 Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5 2023-06-18 23:55:54 +08:00
jay 6378843469 fix: 打包 2023-06-18 23:55:38 +08:00
xiwa 2153e9956b fix:jsonutil修改 2023-06-18 22:23:04 +08:00
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