合并冲突

kmall-admin/src/main/webapp/js/sale/realtimeSalesDetection.js

@@ -182,7 +182,7 @@ let vm = new Vue({
             // currentDate = currentDate.getFullYear()+'-'+(currentDate.getMonth()+1)+'-'+currentDate.getDate();
             postParam={};
             if(vm.type=="store"){
-                vm.storeId = '10'; //测试
+                // vm.storeId = '10'; //测试
                 if(vm.storeId==''||vm.storeId==null){
                     alert("请在输入框中输入门店编号！");
                     return false;