fix database
fix entity