Merge branch 'hotfix/2.1.5'
imporove abstract model & fix sql condition
imporove abstract model & fix sql condition
Merge branch 'hotfix/2.1.6' into develop