new 표시

src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml

@@ -3459,7 +3459,6 @@
                  )bbb			
                  on(bbb.prcs_aplct_prd_ord=aaa.prcsOrd)	
 		GROUP BY rollup(yr, bbb.prcs_nm)				   	
-<<<<<<< HEAD
 	</select>		
 	
 	<select id="VEInstrMixDAO.findByIdFromVeInstr" parameterClass="VEInstrDetailVO" resultClass="VELctrDetailVO">
@@ -3481,8 +3480,6 @@
 			USER_ID = #userId#
 			
 	</select>
-=======
-	</select>
 	
 	<delete id="VEInstrMixDAO.deleteInstrEmailCrtfd" parameterClass="VEInstrDetailVO">
 	/*	VEInstrMixDAO.deleteInstrEmailCrtfd	*/
@@ -3540,5 +3537,4 @@
 		WHERE instr_detail_ord = #instrDetailOrd#
 		AND instr_div = #instrDiv#
 	</update>
->>>>>>> refs/heads/JIWOO
 </sqlMap>

src/main/webapp/WEB-INF/jsp/main/EgovMainList.jsp

@@ -102,8 +102,7 @@ function fn_goDetail(cmmNotifyOrd){
 					<div class="list tbType01">
 						<table>
 							<colgroup>
-								<%-- <col style="width: 3%"> --%>
-								<col style="width: 6%">
+								<col style="width: 2%">
 								<col style="width: 15%">
 								<col style="width: 10%">
 							</colgroup>
@@ -117,18 +116,6 @@ function fn_goDetail(cmmNotifyOrd){
 							<tbody>
 								<c:forEach var="list" items="${list}" varStatus="status">
 								<tr onclick="fn_goDetail('${list.cmmNotifyOrd}')" style="cursor: pointer;" >
-									<%-- <td>
-										<c:choose>
-											<c:when test="${list.notifyChk ne 'Y'}">
-												new
-											</c:when>
-											<c:otherwise>
-											확인완료
-											</c:otherwise>
-										</c:choose>
-				                    </td> --%>
-									<td>
-										<span class="new_icon">NEW</span><ve:code codeId="VE0011" code="${list.lctrDivCd}"/>	
 									<td>
 										<c:if test="${list.notifyChk ne 'Y'}">
 											<span class="new_icon">NEW</span>