--解决合并冲突

workspaces.html

										<a class="worklinkbtn" id="lookMyConsult">>>点击查看</a>
									</div>
									<div class="workcount floatL">
<<<<<<< HEAD
										<p><span class="workcountnum" id="demandNumber">0</span>个发布中的需求</p>
										<a  class="worklinkbtn"id="searchDemand">>>点击搜索</a>
=======
										<p><span class="workcountnum" id="demandNumber">0</span><span id="ponUm">个发布中的需求</span></p>
										<a class="worklinkbtn" id="searchDemand">>>点击搜索</a>
>>>>>>> refs/heads/dev
									</div>
									<!--<div class="workcount floatL">
					                    <p><span class="workcountnum" id="workcontain"></span>条正在进行的合作</p>
<script type="text/javascript" src="js/workindex.js"></script>
<script type="text/javascript" src="js/attention-list.js"></script>
</body>
</html>
</html>