Merge branch 'score_shop' into api_score_meger

jyy

2021-08-09 38ab27c64d593d7b69a0d60eeafde32a9f14395e

 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>