Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.admin into develop

src/main/java/com/style24/persistence/mybatis/shop/TsaPoll.xml

@@ -280,7 +280,7 @@
 		     , TB_POLL_ANSWER B
 		WHERE  A.POLL_QSQ = B.POLL_QSQ
 		GROUP  BY B.ANS_CUST_NO
-		         ,B.REG_DT 
+		         ,DATE_FORMAT(B.REG_DT, '%Y-%m-%d')
 		         ,B.ANS_INDEX
 		         ,A.POLL_SQ
 		)Z

src/main/resources/config/application-style.yml

@@ -96,8 +96,8 @@ shoplinker:
     customer_id : a0024007
     shoplinker_id : istyle1
     xml:
-        path: http://stage.istyle24.com/Partner/ShopLinker/dev
-        view: http://stage.istyle24.com/Partner/ShopLinker/dev
+        path: /files/data/shoplinker
+        view: http://archive.style24.com/shoplinker
     url:
         option : /Product/attribute_insert.php?iteminfo_url=
         product : /Product/attribute_prod_insert.php?iteminfo_url=