s
Merge branch 'master' of https://github.com/duty-dev/duty.git
10-15 14:00
s
Merge branch 'master' of https://github.com/duty-dev/duty.git

Conflicts:
	duty Maven Webapp/src/main/webapp/view/basedata/vehicle.jsp
ssss
s
Merge branch 'master' of https://github.com/duty-dev/duty.git

Conflicts:
	duty Maven
Webapp/src/main/java/com/tianyi/drs/duty/controller/VehicleController.java
	duty Maven Webapp/src/main/webapp/js/basedata/police.js
s
s
Merge branch 'master' of https://github.com/duty-dev/duty.git
1021 1145
Merge branch 'master' of https://github.com/duty-dev/duty.git

Conflicts:
	duty Maven
Webapp/src/main/java/com/tianyi/drs/duty/controller/PoliceGroupController.java
s