--解决合并冲突

js/needSure.js

					} else if($data.demandAim == 3) {
						oDemandAim = "其他咨询"
					}
<<<<<<< HEAD
					$("#dialt").text(oDemandAim);
=======
					$("#demandt").text(oDemandAim);
>>>>>>> refs/heads/dev
					$("#dialog_consultContent").text($data.demandContent);
					$("#nameS").text($data.professor.name);
					if($data.professor.hasHeadImage == 1) {
					$("#offt").text(oString);
					consuId = $data.professor.id;
					if(userid==$data.professor.id){
<<<<<<< HEAD
						$(".basicBtn").hide();
					}
=======
							$(".basicBtn").hide();
						}
>>>>>>> refs/heads/dev
					demandTitle = $data.demandTitle;
					demandContent = $data.demandContent;
					demandType = $data.demandAim
			}
		})
	}
})
})