edit pojo
almost complete
Merge remote-tracking branch 'origin/master'

Conflicts:
	dgms-parent/dgms-persistence/src/main/java/com/drivergroup/persistence/pojo/Charge.hbm.xml
	dgms-parent/dgms-service/src/main/java/com/drivergroup/service/core/DrivingSchoolService.java
	dgms-parent/dgms-service/src/main/java/com/drivergroup/service/core/MsgService.java
	dgms-parent/dgms-service/src/main/java/com/drivergroup/service/core/OrderItemService.java
	dgms-parent/dgms-service/src/main/java/com/drivergroup/service/core/OrderListService.java
	dgms-parent/dgms-service/src/main/java/com/drivergroup/service/core/OrderLocationService.java
	dgms-parent/dgms-service/src/main/java/com/drivergroup/service/core/OrderTimeService.java
	dgms-parent/dgms-service/src/test/java/com/drivergroup/service/core/TTTTTTTTT.java
	dgms-parent/dgms-web/src/main/java/com/drivergroup/web/controller/LoginAction.java
	dgms-parent/dgms-web/src/main/java/com/drivergroup/web/controller/OrderListAction.java
	dgms-parent/dgms-web/src/main/java/com/drivergroup/web/controller/OrderTimeAction.java
	dgms-parent/dgms-web/src/main/java/com/drivergroup/web/controller/StudentAction.java
	dgms-parent/dgms-web/src/main/webapp/js/page.js
	dgms-parent/dgms-web/src/main/webapp/view/ds_register.jsp
	dgms-parent/dgms-web/src/main/webapp/view/stu_letter.jsp
update notice article
Merge remote-tracking branch 'origin/master'

Conflicts:
	dgms-parent/dgms-service/src/main/java/com/drivergroup/service/core/DriverNoticeService.java
	dgms-parent/dgms-service/src/main/java/com/drivergroup/service/core/StudentService.java
	dgms-parent/dgms-web/src/main/webapp/js/login.js
updates
update notice article
Merge remote-tracking branch 'origin/master'

Conflicts:
	dgms-parent/dgms-web/src/main/webapp/css/dgms.css
	dgms-parent/dgms-web/src/main/webapp/images/background-phone.jpg
	dgms-parent/dgms-web/src/main/webapp/view/ds_article.jsp
	dgms-parent/dgms-web/src/main/webapp/view/ds_download.jsp
	dgms-parent/dgms-web/src/main/webapp/view/ds_navigation.jsp
updates
updates
update DgmsStatus
9-11 merge
9-11 merge
911 test
test22