Merge branch 'master' of 10.10.14.250:huanghai/dsMin

dsBaseWeb/Business/BaseRolePerson/BaseRolePersonProto/BaseRolePerson.pb.go

@@ -143,7 +143,7 @@ type GetManageAreaArg struct {
 	//人员ID
 	PersonId string `protobuf:"bytes,1,opt,name=PersonId,proto3" json:"PersonId,omitempty"`
 	//地区类型  1：市  2：区
-	AreaType string `protobuf:"bytes,2,opt,name=AreaType,proto3" json:"AreaType,omitempty"`
+	AreaType int32 `protobuf:"varint,2,opt,name=AreaType,proto3" json:"AreaType,omitempty"`
 	//操作人
 	ActionPersonId string `protobuf:"bytes,3,opt,name=ActionPersonId,proto3" json:"ActionPersonId,omitempty"`
 	//操作IP
@@ -189,11 +189,11 @@ func (x *GetManageAreaArg) GetPersonId() string {
 	return ""
 }
 
-func (x *GetManageAreaArg) GetAreaType() string {
+func (x *GetManageAreaArg) GetAreaType() int32 {
 	if x != nil {
 		return x.AreaType
 	}
-	return ""
+	return 0
 }
 
 func (x *GetManageAreaArg) GetActionPersonId() string {
@@ -591,7 +591,7 @@ var file_BaseRolePerson_proto_rawDesc = []byte{
 	0x0a, 0x10, 0x47, 0x65, 0x74, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x41, 0x72, 0x65, 0x61, 0x41,
 	0x72, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01,
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x1a,
-	0x0a, 0x08, 0x41, 0x72, 0x65, 0x61, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x0a, 0x08, 0x41, 0x72, 0x65, 0x61, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
 	0x52, 0x08, 0x41, 0x72, 0x65, 0x61, 0x54, 0x79, 0x70, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x41, 0x63,
 	0x74, 0x69, 0x6f, 0x6e, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01,
 	0x28, 0x09, 0x52, 0x0e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x65, 0x72, 0x73, 0x6f, 0x6e,

dsBaseWeb/Business/BaseRolePerson/BaseRolePersonProto/BaseRolePerson.proto

@@ -59,7 +59,7 @@ message GetManageAreaArg{
   //人员ID
   string PersonId = 1;
   //地区类型  1：市  2：区
-  string AreaType = 2;
+  int32 AreaType = 2;
   //操作人
   string ActionPersonId = 3;
   //操作IP