zhangqiankun 3 years ago
parent
commit
c588f8e413

+ 1 - 1
saas-account/pom.xml

@@ -6,7 +6,7 @@
 		<artifactId>saas-platform</artifactId>
 		<artifactId>saas-platform</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 	</parent>
-	<artifactId>saas-account-server</artifactId>
+	<artifactId>saas-account</artifactId>
 
 
 	<dependencies>
 	<dependencies>
 		<!-- 依赖集成自定义jar -->
 		<!-- 依赖集成自定义jar -->

+ 3 - 9
saas-account/src/main/java/com/persagy/person/pojo/vo/role/SaasRoleQueryByNameVO.java

@@ -1,7 +1,5 @@
 package com.persagy.person.pojo.vo.role;
 package com.persagy.person.pojo.vo.role;
 
 
-import com.persagy.common.constant.SaasCommonConstant;
-import com.persagy.common.model.BaseUserModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Getter;
@@ -9,7 +7,8 @@ import lombok.Setter;
 import lombok.ToString;
 import lombok.ToString;
 
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
-import java.util.Set;
+
+import com.persagy.common.model.BaseGroupModel;
 
 
 /**
 /**
  * 角色信息
  * 角色信息
@@ -23,12 +22,7 @@ import java.util.Set;
 @Setter
 @Setter
 @ApiModel
 @ApiModel
 @ToString
 @ToString
-public class SaasRoleQueryByNameVO  {
-
-
-    @NotBlank(message = "集团编码,不可为空")
-	@ApiModelProperty(value = "集团编码,作为SQL条件", required = true, example = "RC")
-	private String groupCode; 	// 所属集团编码
+public class SaasRoleQueryByNameVO extends BaseGroupModel {
 
 
     @NotBlank(message = "角色名称,不可为空")
     @NotBlank(message = "角色名称,不可为空")
 	@ApiModelProperty(value = "角色名称,支持模糊查询", example = "zhangsan")
 	@ApiModelProperty(value = "角色名称,支持模糊查询", example = "zhangsan")