Signed-off-by: Nereus <zzrabs@gmail.com>
Merge branch 'dev' of https://github.com/xiaojimao18/atomkios_ddbs.git into dev

Conflicts:
	src/com/len/trans/controller/UserController.java
	src/com/len/trans/dao/impl/FoodDaoImpl.java
	src/com/len/trans/dao/impl/OrderDaoImpl.java
Merge branch 'dev' of https://github.com/xiaojimao18/atomkios_ddbs.git into dev

Conflicts:
	src/com/len/trans/controller/UserController.java
	src/com/len/trans/dao/impl/FoodDaoImpl.java
	src/com/len/trans/dao/impl/OrderDaoImpl.java

Signed-off-by: Nereus <zzrabs@gmail.com>