工单详细信息及回单
Merge origin

Conflicts:
	HCPV-SCADA-client/libs/HCPV-SCADA-api.jar
	HCPV-SCADA-client/libs/HCPV-SCADA-client-lib.jar
	HCPV-SCADA-client/res/layout/activity_work_order.xml
	HCPV-SCADA-client/res/layout/activity_work_order_handle.xml