fix for error in mybatis xml definition
Merge remote-tracking branch 'upstream/master'