增加通过租户列表查询

2.增加租户类型字段

blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java

@@ -108,4 +108,7 @@ public class Tenant extends BaseEntity {
 	@ApiModelProperty(value = "授权码")
 	private String licenseKey;
 
+	@ApiModelProperty(value = "租户类型 默认  干仓配  2 商场")
+	private Integer tenantType;
+
 }

blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java

@@ -59,6 +59,7 @@ public interface ISysClient {
 	String TENANT = API_PREFIX + "/tenant";
 	String TENANT_ID = API_PREFIX + "/tenant-id";
 	String TENANT_NAME = API_PREFIX + "/tenant-name";
+	String TENANTLIST = API_PREFIX + "/tenant-list";
 	String TENANT_PACKAGE = API_PREFIX + "/tenant-package";
 	String PARAM = API_PREFIX + "/param";
 	String PARAM_VALUE = API_PREFIX + "/param-value";
@@ -259,6 +260,8 @@ public interface ISysClient {
 	@GetMapping(TENANT_NAME)
 	R<Tenant> getTenantByName(@RequestParam("tenantName") String tenantName);
 
+	@GetMapping(TENANTLIST)
+	R<List<Tenant>> getTenantList();
 
 	/**
 	 * 获取租户产品包

blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java

@@ -133,6 +133,12 @@ public class ISysClientFallback implements ISysClient {
 		return R.fail("获取数据失败");
 	}
 
+
+	@Override
+	public R<List<Tenant>> getTenantList() {
+		return R.fail("获取数据失败");
+	}
+
 	@Override
 	public R<Tenant> getTenant(String tenantId) {
 		return R.fail("获取数据失败");

blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java

@@ -190,6 +190,13 @@ public class SysClient implements ISysClient {
 		return R.data(tenantService.getOne(queryWrapper));
 	}
 
+	@Override
+	public R<List<Tenant>> getTenantList() {
+		QueryWrapper queryWrapper = new QueryWrapper();
+		queryWrapper.eq("is_deleted",0);
+		return R.data(tenantService.list(queryWrapper));
+	}
+
 	@Override
 	@GetMapping(TENANT_PACKAGE)
 	public R<TenantPackage> getTenantPackage(String tenantId) {