From 67e2e142e752b724e021f3562c7f28e128e6f118 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 16 Mar 2021 18:35:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/resources/templates/views/admin/shop/shopDeliveryInfo-list.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/shop/shopDeliveryInfo-list.html b/zq-erp/src/main/resources/templates/views/admin/shop/shopDeliveryInfo-list.html
index 6f8ee2c..6001df2 100644
--- a/zq-erp/src/main/resources/templates/views/admin/shop/shopDeliveryInfo-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/shop/shopDeliveryInfo-list.html
@@ -60,7 +60,7 @@
 									<div class="form-group mr-20 ml-20">
 										<span class="serch-title">物流公司:</span>
 										<select class="form-control autoFull" style="width: 190px"
-												th:data-url="@{/wxapi/dataDictionary/getListByParentCode/kdgs}" data-value="typeCode"
+												th:data-url="@{/admin/customerDictionary/getListByParentCode/kdgs}" data-value="typeCode"
 												data-filed="typeName" name="logisticsCompanyCode">
 											<option value=''>--请选择物流公司--</option>
 										</select>

--
Gitblit v1.9.1