Merge "[UUI-SERVER] Modify field name and fix postgresql error"