Rename field name categoryId to categoryUuid
Merge branch 'master' of https://github.com/cloudelin/globalrent.data.git