s
Merge branch 'lxyao' of git.omnilab.sjtu.edu.cn:zhangzhaohui/dwms into sky
sky
Merge branch 'zhangbin' of git.omnilab.sjtu.edu.cn:zhangzhaohui/dwms into sky
backup the sql
check add feature
Merge branch 'zhangbin' of git.omnilab.sjtu.edu.cn:zhangzhaohui/dwms into lxyao
delete the ignore files
Merge branch 'sky' of git.omnilab.sjtu.edu.cn:zhangzhaohui/dwms into zhangbin
Merge branch 'lxyao' of git.omnilab.sjtu.edu.cn:zhangzhaohui/dwms into zhangbin
modify text size in TWO
sky
fix waste_id
production, transport, reception homepage icon
Merge branch 'lxyao' of git.omnilab.sjtu.edu.cn:zhangzhaohui/dwms into zhangbin
Merge branch 'sky' of git.omnilab.sjtu.edu.cn:zhangzhaohui/dwms into zhangbin
fix another waste name problem
change the homepage icons
Merge branch 'lxyao' of git.omnilab.sjtu.edu.cn:zhangzhaohui/dwms into zhangbin
test