Merge branch 'master' into crm_15.9.1

src/views/custom_manage/customList/editCustomEn.vue

@@ -231,7 +231,7 @@ import reportVarietyEnSet from '@/components/reportVarietyEnSet.vue'
     methods: {
       // 获取销售列表
       getSellerList(){
-        customInterence.saleslist({SellerType:1}).then(res=>{
+        customInterence.saleslist({SellerType:0}).then(res=>{
           if(res.Ret == 200){
             this.sellerList = res.Data.List || []
           }