Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileMerchantInfoController.java

@@ -44,6 +44,17 @@ public class PileMerchantInfoController extends BaseController {
 		return getDataTable(list);
 	}
 
+
+	/**
+	 * 查询一级运营商列表
+	 */
+	@PreAuthorize("@ss.hasPermi('pile:merchant:list')")
+	@GetMapping("queryFirstLevelMerchant")
+	public TableDataInfo queryFirstLevelMerchant() {
+		List<PileMerchantInfo> list = pileMerchantInfoService.queryFirstLevelMerchant();
+		return getDataTable(list);
+	}
+
 	/**
 	 * 获取运营商列表 不分页
 	 * @param pileMerchantInfo