g5 merge 충돌수정

This commit is contained in:
chicpro
2013-10-02 09:13:33 +09:00
44 changed files with 811 additions and 551 deletions

View File

@ -69,8 +69,8 @@ $from_record = ($page - 1) * $rows; // 시작 열을 구함
만료<?php echo substr(str_replace('-', '', $row['po_expire_date']), 2); ?>
<?php } else echo $row['po_expire_date'] == '9999-12-31' ? '&nbsp;' : $row['po_expire_date']; ?>
</td>
<td class="td_bignum"><?php echo $point1; ?></td>
<td class="td_bignum"><?php echo $point2; ?></td>
<td class="td_numbig"><?php echo $point1; ?></td>
<td class="td_numbig"><?php echo $point2; ?></td>
</tr>
<?php
}