|
|
|
@ -9,13 +9,10 @@
|
|
|
|
|
<option name="autoReloadType" value="SELECTIVE" />
|
|
|
|
|
</component>
|
|
|
|
|
<component name="ChangeListManager">
|
|
|
|
|
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="이유식레시피, 시판이유식 자동검색 적용">
|
|
|
|
|
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="추천홈메이드이유식 수정">
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_growth/M_Bf_growthController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_growth/M_Bf_growthController.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/index/M_IndexController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/index/M_IndexController.java" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/admin/bf/com.backoffice.admin.bf.bf_recommend.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/admin/bf/com.backoffice.admin.bf.bf_recommend.xml" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_daily.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_daily.ftl" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_bf_homemade_popup.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_bf_homemade_popup.ftl" afterDir="false" />
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_bf_ingredient_popup.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_bf_ingredient_popup.ftl" afterDir="false" />
|
|
|
|
|
</list>
|
|
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
|
@ -190,7 +187,7 @@
|
|
|
|
|
<workItem from="1648430275073" duration="49000" />
|
|
|
|
|
<workItem from="1648430348136" duration="702000" />
|
|
|
|
|
<workItem from="1648431787209" duration="14235000" />
|
|
|
|
|
<workItem from="1648451792083" duration="1343000" />
|
|
|
|
|
<workItem from="1648451792083" duration="3270000" />
|
|
|
|
|
</task>
|
|
|
|
|
<task id="LOCAL-00001" summary="최초 커밋">
|
|
|
|
|
<created>1645354476031</created>
|
|
|
|
@ -241,7 +238,14 @@
|
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
|
<updated>1648440207179</updated>
|
|
|
|
|
</task>
|
|
|
|
|
<option name="localTasksCounter" value="8" />
|
|
|
|
|
<task id="LOCAL-00008" summary="추천홈메이드이유식 수정">
|
|
|
|
|
<created>1648453690193</created>
|
|
|
|
|
<option name="number" value="00008" />
|
|
|
|
|
<option name="presentableId" value="LOCAL-00008" />
|
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
|
<updated>1648453690193</updated>
|
|
|
|
|
</task>
|
|
|
|
|
<option name="localTasksCounter" value="9" />
|
|
|
|
|
<servers />
|
|
|
|
|
</component>
|
|
|
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
|
|
@ -268,6 +272,7 @@
|
|
|
|
|
<MESSAGE value="SNS 탈퇴 로그인 불가 처리 메시지" />
|
|
|
|
|
<MESSAGE value="한글파일명 음악파일 업로드이슈 수정" />
|
|
|
|
|
<MESSAGE value="이유식레시피, 시판이유식 자동검색 적용" />
|
|
|
|
|
<option name="LAST_COMMIT_MESSAGE" value="이유식레시피, 시판이유식 자동검색 적용" />
|
|
|
|
|
<MESSAGE value="추천홈메이드이유식 수정" />
|
|
|
|
|
<option name="LAST_COMMIT_MESSAGE" value="추천홈메이드이유식 수정" />
|
|
|
|
|
</component>
|
|
|
|
|
</project>
|