Commit Graph

702 Commits (45641f495c7328482529ddad329bc02a21ee5295)

Author SHA1 Message Date
tangfudong 45641f495c fix:用户新增默认设置用户类型 2023-06-28 10:08:41 +08:00
tangfudong 3b83b694f8 fix:修复测试模块编译 2023-06-28 10:02:29 +08:00
荭琪枫 b5d60b6611 update:修改productkey 2023-06-27 23:57:22 +08:00
荭琪枫 1bd2a9ac9d feat:修改OTA升级 2023-06-27 23:04:34 +08:00
荭琪枫 e5ba3865ab Merge branch 'dev-V0.4.5' of https://gitee.com/iotkit-open-source/iotkit-parent into dev-V0.4.5 2023-06-27 22:48:38 +08:00
荭琪枫 f92bdd9235 feat:修改OTA升级 2023-06-27 22:48:21 +08:00
regan 00952b35ab docs: 待优化项目 2023-06-27 22:32:40 +08:00
jay f4f79e39f3 update: oss待优化项 2023-06-27 21:58:55 +08:00
jay d197896233 update: oss待优化项 2023-06-27 20:20:51 +08:00
xiwa c74d5e5273
!12 修改dockerfile中错误的路径
Merge pull request !12 from albb0608/dev-V0.4.5
2023-06-27 11:49:05 +00:00
jay 518fbc2999 fix: 报警记录表无法生成 2023-06-27 19:02:02 +08:00
albb0608 d7d78aaea4
!1 修改dockerfile中错误的路径
Merge pull request !1 from albb0608/mydev
2023-06-27 09:06:56 +00:00
albb0608 72cb270905 修改DockerFile中错误的文件夹 2023-06-27 17:01:36 +08:00
tangfudong aa888a3627 fix:迁移设备地图 2023-06-27 11:45:36 +08:00
regan 60e09b27c3 docs: 待优化项目 2023-06-26 22:35:12 +08:00
tangfudong 2779fc269a update:迁移数据大屏模块 2023-06-26 13:53:54 +08:00
jay 7d59858c53 refactor: 代码生成器模板 2023-06-25 21:57:52 +08:00
jay 5051ac78a8 refactor: 代码生成器模板 2023-06-25 21:52:19 +08:00
jay 063ad4f9c5 Merge remote-tracking branch 'origin/dev-V0.4.5' into dev-V0.4.5 2023-06-25 21:51:54 +08:00
jay d148a354ca fix: oss初始化 2023-06-25 21:51:39 +08:00
regan ac27d1b57f docs: 待优化项目 2023-06-25 21:46:40 +08:00
jay 49b8241ad1 fix: 代码生成器中的WorkerId 2023-06-25 11:45:07 +08:00
jay f50e65b158 fix: 代码生成器菜单 2023-06-24 21:15:57 +08:00
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