-
# Conflicts: # yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thinkmodelfunction/IotThinkModelFunctionController.http
-
fix typo: adminTenentId -> adminTenantId, appTenentId -> appTenantId
-
Merge pull request !1217 from Lesan/feature/bpm-new