Merge branch 'susu' into dev

# Conflicts:
#	admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java
This commit is contained in:
주수현
2025-07-21 12:26:22 +09:00
4 changed files with 13 additions and 4 deletions

View File

@@ -13,7 +13,8 @@
<ul class="product-col-list">
<li th:each="item : ${list.content}"
th:classappend="${item.forestProductStatus != MonthStatus.NONE} ? ' complete'">
th:class="|${item?.forestProductStatus == MonthStatus.REGISTERED ? 'complete' :
item?.forestProductStatus == MonthStatus.NOTHING ? 'complete-nodata' : ''}|">
<a th:href="@{/info/monthly/create/{id}(id=${item.id})}">
<p class="list-tit" th:text="${item.koreanMonth}"></p>
<span class="tag" th:text="${item.forestProductStatus.desc}"></span>