Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/structure/StructureServiceImpl.java

         if(StringUtils.isEmpty(entity.getRoadId()) && StringUtils.isEmpty(entity.getSectionId())){
             return JsonResult.error("公路和路段为空");
         }
+        //获取租户id
+        String tenantId = CurrentUserUtil.getTenantId();
         //查询用户信息
         if(StringUtils.isEmpty(entity.getId())){
             //新增
             entity.setCreateTime(DateUtils.now());
             entity.setCreateUser(userId);
+            entity.setTenantId(tenantId);
         }else {
             //更新
             entity.setUpdateTime(DateUtils.now());
             entity.setUpdateUser(userId);
+            entity.setTenantId(tenantId);
         }
         super.edit(entity);