diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 67d21f2..36c23bc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,10 +9,9 @@
-
+
-
-
+
@@ -250,14 +249,9 @@
-
-
-
- 1648822833746
-
-
-
- 1648822833746
+
+
+
1648908705168
@@ -595,7 +589,14 @@
1651675831475
-
+
+ 1651736465197
+
+
+
+ 1651736465197
+
+
@@ -615,7 +616,6 @@
-
@@ -640,17 +640,7 @@
-
-
-
-
-
-
- file://$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envController.java
- 179
-
-
-
-
+
+
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl b/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl
index 6faae4e..a2ad7d0 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl
@@ -65,14 +65,9 @@
-
<#assign pre_date = model['dayList']['day1'] + ''>
- <#assign idx = 0>
- <#assign pre_hour = ''>
<#list model['time_list'] as item>
<#if item['day'] == pre_date>
- <#if (item['hour'] + '') == pre_hour>
-<#-- <#assign idx = idx + 0.5>-->
- #if>
- <#assign topP = item['hour'] + idx>
+ <#assign topP = item['hour']>
<#assign pre_hour = item['hour'] + ''>
#if>
@@ -80,14 +75,9 @@
-
<#assign pre_date = model['dayList']['day2'] + ''>
- <#assign idx = 0>
- <#assign pre_hour = ''>
<#list model['time_list'] as item>
<#if item['day'] == pre_date>
- <#if (item['hour'] + '') == pre_hour>
-<#-- <#assign idx = idx + 0.5>-->
- #if>
- <#assign topP = item['hour'] + idx>
+ <#assign topP = item['hour']>
<#assign pre_hour = item['hour'] + ''>
#if>
@@ -95,14 +85,9 @@
-
<#assign pre_date = model['dayList']['day3'] + ''>
- <#assign idx = 0>
- <#assign pre_hour = ''>
<#list model['time_list'] as item>
<#if item['day'] == pre_date>
- <#if (item['hour'] + '') == pre_hour>
-<#-- <#assign idx = idx + 0.5>-->
- #if>
- <#assign topP = item['hour'] + idx>
+ <#assign topP = item['hour']>
<#assign pre_hour = item['hour'] + ''>
#if>
@@ -110,14 +95,9 @@
-
<#assign pre_date = model['dayList']['day4'] + ''>
- <#assign idx = 0>
- <#assign pre_hour = ''>
<#list model['time_list'] as item>
<#if item['day'] == pre_date>
- <#if (item['hour'] + '') == pre_hour>
-<#-- <#assign idx = idx + 0.5>-->
- #if>
- <#assign topP = item['hour'] + idx>
+ <#assign topP = item['hour']>
<#assign pre_hour = item['hour'] + ''>
#if>
@@ -125,14 +105,9 @@
-
<#assign pre_date = model['dayList']['day5'] + ''>
- <#assign idx = 0>
- <#assign pre_hour = ''>
<#list model['time_list'] as item>
<#if item['day'] == pre_date>
- <#if (item['hour'] + '') == pre_hour>
-<#-- <#assign idx = idx + 0.5>-->
- #if>
- <#assign topP = item['hour'] + idx>
+ <#assign topP = item['hour']>
<#assign pre_hour = item['hour'] + ''>
#if>
@@ -140,14 +115,9 @@
-
<#assign pre_date = model['dayList']['day6'] + ''>
- <#assign idx = 0>
- <#assign pre_hour = ''>
<#list model['time_list'] as item>
<#if item['day'] == pre_date>
- <#if (item['hour'] + '') == pre_hour>
-<#-- <#assign idx = idx + 0.5>-->
- #if>
- <#assign topP = item['hour'] + idx>
+ <#assign topP = item['hour']>
<#assign pre_hour = item['hour'] + ''>
#if>
@@ -155,14 +125,9 @@
-
<#assign pre_date = model['dayList']['day7'] + ''>
- <#assign idx = 0>
- <#assign pre_hour = ''>
<#list model['time_list'] as item>
<#if item['day'] == pre_date>
- <#if (item['hour'] + '') == pre_hour>
-<#-- <#assign idx = idx + 0.5>-->
- #if>
- <#assign topP = item['hour'] + idx>
+ <#assign topP = item['hour']>
<#assign pre_hour = item['hour'] + ''>
#if>