sssaaa
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/business/connectdb/db/RBookRequire.java
edit truck
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
reg.jsp