确认提货，提示框不消失

kmall-admin/src/main/java/com/kmall/admin/controller/PickUpCodeController.java

@@ -170,6 +170,7 @@ public class PickUpCodeController {
      * @return
      */
     @RequestMapping("/confirmDelivery/{orderSn}")
+    @ResponseBody
     public R confirmDelivery(@PathVariable("orderSn") String orderSn){
         if(StringUtils.isEmpty(orderSn)){
             return R.error("订单编号为空！");

kmall-admin/src/main/java/com/kmall/admin/service/GoodsService.java

@@ -187,6 +187,7 @@ public interface GoodsService {
 
     /**
      * 根据商品名称查询商品
+     * @param storeId
      * @param goodsName
      * @return
      */

kmall-admin/src/main/webapp/WEB-INF/page/sale/salesdataupload.html

@@ -32,7 +32,7 @@
                 <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
                 #end-->
                 <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
-                <i-button type="ghost" @click="upload" icon="ios-cloud-upload-outline">&nbsp;销售数据导入</i-button>
+                <i-button type="ghost" @click="upload" icon="ios-cloud-upload-outline">&nbsp;销售数据上传</i-button>
                 <i-button type="primary" @click="download"><i class="fa fa-cloud-download"></i>&nbsp;下载</i-button>
             </div>
         </Row>