entityクラスの一部修正とDAOのメソッド名修正
Merge branch 'develop' of https://github.com/k-kunita/IKITSUKE into develop