Merge branch 'develop' into bin2107

src/main/java/com/style24/admin/biz/web/TsaCustomerController.java

@@ -347,7 +347,7 @@ public class TsaCustomerController extends TsaBaseController {
 		mav.addObject("genderGbList", rendererService.getCommonCodeList("G007"));
 
 		// 회원 구분
-		mav.addObject("custGbList", rendererService.getCommonCodeList("G100"));
+		mav.addObject("custGbList", rendererService.getCommonCodeList("G100","Y"));
 
 		// 회원 등급
 		mav.addObject("custGradeList", rendererService.getCommonCodeList("G110"));

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

@@ -4566,6 +4566,9 @@
 		     , #{regNo}
 		     , NOW()
 		)
+		ON DUPLICATE KEY UPDATE
+		       REG_NO = #{regNo}
+		     , REG_DT = NOW()
 	</insert>
 	
 	<!-- 총알배송 제외 상품 삭제 -->

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

@@ -16,74 +16,38 @@ logging:
     config: classpath:log/logback-tsit.xml
 
 domain:
-    admin: //ts5000.ipdisk.co.kr
-    pastel: //tdfront.pastelmall.com
-    image: //image.pastelmall.com
-    cdnimage: //img.pastelmall.com/pastelmall_images
-    uximage: //pt-office.pastelmall.com
+    admin: //tdadmin.style24.com
+    style24: //tdfront.style24.com
+    front: //tdfront.style24.com
+    image: //tdimage.style24.com
+    cdnimage: //tdimage.style24.com
+    uximage: //tdimage.style24.com
 
 upload:
     default:
         target.path: /TSIT/servers/files/data
         max.size: 10
         allow.extension: jpg|gif|jpeg|png|bmp|txt|doc|docx|ppt|pptx|xls|xlsx|hwp|pdf
-        view: //image.pastelmall.com
+        view: //tdimage.style24.com
     goods:
         target.path: /TSIT/servers/files/data/goods
         max.size: 10
         allow.extension: jpg|gif|jpeg|png
-        view: //img.pastelmall.com/goods
+        view: //tdimage.style24.com/Upload/ProductImage
     image:
         target.path: /TSIT/servers/files/data
         max.size: 10
         allow.extension: jpg|gif|jpeg|png
-        view: //image.pastelmall.com
+        view: //tdimage.style24.com
     excel:
         target.path: /TSIT/servers/files/data/excel
         max.size: 10
         allow.extension: xls|xlsx
-        view: //tdimage.pastelmall.com/excel
+        view: //tdimage.style24.com/excel
     sample:
         target.path: /WIDE/workspace/files/data
         max.size: 10
         allow.extension: txt|doc|docx|ppt|pptx|xls|xlsx|hwp|pdf
-        view: //tdimage.pastelmall.com/sample
+        view: //tdimage.style24.com/sample
 
 download.path: /TSIT/servers/files/data
-
-# Directsend API
-#mail:
-#    pastel.url: https://tdfront.pastelmall.com
-#    admin.url: https://tdadmin.pastelmall.com
-#    image.url: https://tdfront.pastelmall.com/image/web/mail
-#    template.path: /TSIT/servers/webapps/pastelmall.admin/WEB-INF/mail
-#    send.flag: N
-#    api :
-#        url: https://directsend.co.kr/index.php/api_v2/mail_change_word
-#        username : tribons1
-#        key : UQbDUz0TNwGt1Ay
-#        from : pastelmall@tribons.co.kr
-#        sender: 파스텔몰
-
-# EC모니터 API
-#ecmonitor:
-#    url: http://222.112.8.121:8085/
-        
-# juso.go.kr
-#juso:
-#    api:
-#        key: U01TX0FVVEgyMDIwMDUxMzEzMzUwOTEwOTc1NDc=
-#        url: http://www.juso.go.kr/addrlink/addrLinkApiJsonp.do
-
-# PG
-#pg:
-#    nicepay:
-#        merchantId: nictest00m
-#        merchantKey: 33F49GnCMS1mFYlGXisbUDzVf2ATWCl9k3R++d5hDd3Frmuos/XLx8XhXpe+LDYAbpGKZYSwtlyyLOtS/8aD7A==
-#        log.path: /TSIT/servers/logs/pastelmall/admin
-#        account.cert.url: https://webapi.nicepay.co.kr/api/checkBankAccountAPI.jsp
-
-# WMS
-#wms:
-#    api:
-#        cancelurl: http://dncs.8200.co.kr:8081/Service.asmx

src/main/webapp/WEB-INF/views/goods/GoodsQuikDeliverySkipForm.html

@@ -133,10 +133,12 @@
 		</div>
 		</form>
 		<!-- //패널 영역2 -->
+<script type="text/javascript" src="/ux/plugins/gaga/gaga.paging.js?v=20210114"></script>
 <script th:inline="javascript">
 /*<![CDATA[*/
 	
 	var sessRoleCd = [[${sessionInfo.roleCd}]];
+	var goodsStatList = gagajf.convertToArray([[${goodsStatList}]]);
 	var columnDefs = [];
 	columnDefs = [
 		{width: 40, minWidth: 40, cellClass: 'text-right', headerCheckboxSelection: true, checkboxSelection: true, filter: false},