--解决合并冲突

needSure.html

@@ -55,11 +55,7 @@
                </div>
                <div class="dialoginfotype clearfix inline" style="margin-left:50px">
                	<span class="floatL" id="">需求目的：</span>
<<<<<<< HEAD
                	<span class="dialogtit floatL" id="dialt"></span>
=======
                	<span class="dialogtit floatL" id="demandt"></span>
>>>>>>> refs/heads/dev
                </div>
                <div class="dialoginfotype clearfix" id="dialog_consultContentContainer">
                	<div class="floatL" id="dialog_consultContentTitle">需求内容：</div>