--解决合并冲突

css/workspace.css

@@ -9,11 +9,7 @@
.updownbtn{text-decoration:underline; color:#333;}
/*左侧菜单*/
<<<<<<< HEAD
.workmenu{text-align: center; float:left; width:12%; height:300px; background: #fafafa;border-radius: 6px;overflow: hidden;}
=======
.workmenu{text-align:center; float:left; width:12%; height:300px; background: #fafafa;border-radius: 6px;overflow: hidden;}
>>>>>>> refs/heads/dev
a.workmenutit{height: 60px;padding: 0 20px;font-size:16px;line-height:60px; border-bottom:1px #ff9900 solid;cursor:pointer; display:block;color:#313131; }
a.worksubmenu{width:100%; height:40px; margin:10px 0; font-size:15px;line-height:40px; color:#313131; cursor:pointer;display: block;}
a.worksubmenu.subcolor{ background:#ff9900; color:#fff;}

myDemand.html

@@ -147,13 +147,9 @@
             
            <div class="workselectcon" id="wode">
                <div id="workContainer2">
<<<<<<< HEAD
                	<div id="myNeed"></div>
=======
                	<div id="myNeed">
                		
                	</div>
>>>>>>> refs/heads/dev
                </div>
                <div class="tcdPageCode getReplyPage"></div>
            </div>

needList.html

@@ -68,10 +68,7 @@
                <div id="workContainer">
                	<div id="workContainer2">
                		<div id="demandList">
<<<<<<< HEAD
=======
                			
>>>>>>> refs/heads/dev
                		</div>
                	</div>
                

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>