Merge branch 'dev' of http://121.42.53.174:3000/jiapeng/portal-front.git into dev

js/resourceShow.js

			var data = {
				"professorId": userid,
				"watchObject": watchObject,
				"watchType": 3
				"watchType": 2
			}
		}
		$.ajax({