mes
my commit
Merge branch 'DEMO1' of https://github.com/IF048JAVA/SoftTour into DEMO1
change UserDao
Merge branch 'DEMO1' of https://github.com/IF048JAVA/SoftTour into DEMO1