完成定制查询的联动，加入debuglog
Merge branch 'master' of https://github.com/amsDevelop/collaboration_team

Conflicts:
	src/com/sinopec/activity/ConditionQuery.java
	src/com/sinopec/activity/MarinedbActivity.java