--解决合并冲突

needList.html

@@ -60,6 +60,9 @@
                       
                    </div>
                    <input id="timeSortId" type="text" value="0" style="display:none;">
                    <div class="workselectbox floatL">
                        <div class="orderedbtn" id="consultArrow"><div></div></div>
                    </div>
                
                </form>
             </div>   
@@ -68,10 +71,7 @@
                <div id="workContainer">
                	<div id="workContainer2">
                		<div id="demandList">
<<<<<<< HEAD
=======
                			
>>>>>>> refs/heads/dev
                		</div>
                	</div>