assign
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebContent/css/form.css
bookrequire
book
add sagent and edit RCagent
update LoginServlet
sssaaa
Merge remote-tracking branch 'origin/master'

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

Conflicts:
	WebContent/listAssign.jsp
	WebContent/logincontent.jsp
Merge remote-tracking branch 'origin/master'
update Manage
Merge remote-tracking branch 'origin/master'
reg.jsp
register.do
的
好
t
merge register.do
order