Merge branch 'api' into score_shop

jyy

2021-03-10 df6a117d2923400fef1ed14cd60d14f56f4a6eec

 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>