Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into master_hella

# Conflicts:
#	src/pages/index/index.vue

src/api/request2.js

@@ -176,19 +176,10 @@ export function getMessageUnreadCount() {
 /**
  * 获取单据开关配置
  */
-export function getSwitchByCode(code) {
-	var params ={
-		filters:[{
-			column:"code",
-			action:"==",
-			value:code
-		}],
-		pageNo:1,
-		pageSize:10,
-	}
+export function getSwitchByCode(params) {
 	
 	return request({
-		url: baseApi + "/wms/switch/senior",
+		url: baseApi + "/wms/switch/getSwitchList",
 		method: "post",
 		data: params
 	});