--更改合并冲突；

js/myDemand.js

@@ -77,11 +77,7 @@ $(document).ready(function() {
					$data[i].closeTime.substr(8, 2) + ":" + $data[i].closeTime.substr(10, 2);
				oString += "<div class='floatL' style='margin-left:40px;'>关闭时间：<span class='lasttime'>" + oCloseTime + "</span></div></div>"
			}
<<<<<<< HEAD
			oString += "<div style='height:70px;'><p class='rebackcon lastReplyCon' style='width: 860px;' >" + $data[i].demandContent + "</p></div></h6></div>"
=======
			oString += "<div style='height:70px'><p class='rebackcon lastReplyCon' style='width: 860px;' >" + $data[i].demandContent + "</p></div></h6></div>"
>>>>>>> refs/heads/dev
			oString += "<div class='workhandle'>"
			oString += "<div class='rightopert floatR'>"
			oString += "<span class='replybtn'demanid='" + $data[i].demandId + "'>查看</span></div>"
@@ -408,15 +404,10 @@ $(document).ready(function() {
				}
			}
<<<<<<< HEAD
		})
})
=======
		},
		error: function(XMLHttpRequest, textStats, errorThrown) {
		}
	})
})
>>>>>>> refs/remotes/origin/dev
})