fix column name to deal with different naming strategy
fix invalid annotation
fix joincolumn annotation
correct ref column name
Merge remote-tracking branch 'test/fix-column-name'