Merge branch 'devs' of https://gitlab.com/big.imcloud/badyfeed/bf.git into devs

.idea/workspace.xml

@@ -9,13 +9,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="">
+    <list default="true" id="481e8a07-f5d9-4eca-b522-b6abbfcfa659" name="변경" comment="메인화면 챗봇 링크 적용">
-      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
       <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_family/M_Bf_familyController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_family/M_Bf_familyController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/m/js/common.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/m/js/common.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync_confirm.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync_confirm.ftl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/개발참고.txt" beforeDir="false" afterPath="$PROJECT_DIR$/개발참고.txt" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -47,6 +43,9 @@
     <option name="CUSTOM_FILTER" />
   </component>
   <component name="ProjectId" id="25N3nbghfzlUr7bQe0LDtBjHKie" />
+  <component name="ProjectLevelVcsManager">
+    <ConfirmationsSetting value="2" id="Add" />
+  </component>
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
@@ -62,7 +61,7 @@
     <property name="settings.editor.splitter.proportion" value="0.3126273" />
   </component>
   <component name="RunManager">
-    <configuration name="Tomcat 9.0.43" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 9.0.43" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="1.8" nameIsGenerated="true">
+    <configuration name="Tomcat 8.5.73" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.73" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="1.8" nameIsGenerated="true">
       <option name="OPEN_IN_BROWSER_URL" value="http://devops.lookylooks.ai:14288/bf/" />
       <option name="COMMON_VM_ARGUMENTS" value="-Dfile.encoding=UTF-8" />
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
@@ -211,7 +210,6 @@
         </entry>
       </map>
     </option>
-    <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />

src/main/webapp/m/js/common.js

@@ -368,7 +368,7 @@ var SNUtil = {
     },
     
     makeAnyPicker(id, defaultDate, token){
-			$("#" + id).AnyPicker({
+        			$("#" + id).AnyPicker({
 				headerTitle: {
 					markup: "<span class='ap-header__title'>생년월일 선택 (년도/월/일)</span>",
 				},
@@ -379,9 +379,10 @@ var SNUtil = {
 				
 				onInit: function()
 				{
-          if(defaultDate != ''){
+                  if(defaultDate != ''){
-            this.setSelectedDate(SNUtil.getDate(defaultDate, token));
+                    defaultDate = defaultDate.replaceAll(".", "-");
-          }
+                    this.setSelectedDate(SNUtil.getDate(defaultDate, "-"));
+                  }
 				}
 
 			});