Merge branch 'dev'

+version: v1
+kind: Attribute
+metadata:
+  name: department
+  description: 部门
+  type: 
+    schema: department

+version: v1
+kind: Attribute
+metadata:
+  name: organizations
+  description: 关联的组织机构
+  type: 
+    array: organization

@@ -19,6 +19,8 @@ metadata:
   - ref: organization
     description: 数据关联组织机构
     required: true
+  - ref: companyId
+    required: true
   - ref: updatedAt
     required: true
   - ref: deletedAt

@@ -27,6 +27,8 @@ metadata:
   - ref: organization
     description: 数据关联组织机构
     required: true
+  - ref: companyId
+    required: true
   - ref: createdAt
     required: true
   - ref: deletedAt

@@ -28,6 +28,8 @@ metadata:
   - ref: organization
     description: 数据关联组织机构
     required: true
+  - ref: companyId
+    required: true
   - ref: operator
     required: true
   - ref: operateTime

@@ -14,6 +14,8 @@ metadata:
     required: true
   - ref: undertakers
     required: true
+  - ref: companyId
+    required: true
   - ref: operator
     required: true
   - ref: updatedAt

@@ -18,6 +18,8 @@ metadata:
   - ref: organization
     description: 数据关联组织机构
     required: true
+  - ref: companyId
+    required: true
   - ref: remarks
     required: true
   - ref: operator

@@ -24,6 +24,8 @@ metadata:
   - ref: organization
     description: 数据关联组织机构
     required: true
+  - ref: companyId
+    required: true
   - ref: operator
     required: true
   - ref: operateTime

@@ -32,6 +32,8 @@ metadata:
   - ref: organization
     description: 数据关联组织机构
     required: true
+  - ref: companyId
+    required: true
   - ref: operator
     required: true
   - ref: operateTime

+version: v1
+kind: Schema
+metadata:
+  name: department
+  description: 部门值对象
+  attributes:
+  - ref: departmentId
+    required: true
+  - ref: departmentName
+    required: true
+  - ref: departmentNumber
+    required: true
+  - ref: IsOrganization
+    required: true

@@ -28,6 +28,8 @@ metadata:
   - ref: organization
     description: 数据关联组织机构
     required: true
+  - ref: companyId
+    required: true
   - ref: operator
     required: true
   - ref: operateTime

@@ -24,6 +24,8 @@ metadata:
   - ref: organization
     description: 数据关联组织机构
     required: true
+  - ref: companyId
+    required: true
   - ref: updatedAt
     required: true
   - ref: deletedAt

@@ -28,6 +28,8 @@ metadata:
   - ref: organization
     description: 数据关联组织机构
     required: true
+  - ref: companyId
+    required: true
   - ref: createdAt
     required: true
   - ref: deletedAt

@@ -35,6 +35,8 @@ metadata:
   - ref: organization
     description: 数据关联组织机构
     required: true
+  - ref: companyId
+    required: true
   - ref: createdAt
     required: true
   - ref: deletedAt

@@ -26,6 +26,8 @@ metadata:
   - ref: organization
     description: 数据关联组织机构
     required: true
+  - ref: companyId
+    required: true
   - ref: updatedAt
     required: true
   - ref: deletedAt

+version: v1
+kind: Schema
+metadata:
+  name: referrer
+  description: 推荐人值对象
+  attributes:
+  - ref: userId
+    required: true
+  - ref: userBaseId
+    required: true
+  - ref: role
+    required: true
+  - ref: organizations
+    description: 用户关联的组织机构
+    required: true
+  - ref: organization
+    description: 用户所属的组织机构
+    required: true
+  - ref: department
+    description: 用户所属的部门
+    required: true
+  - ref: company
+    required: true
+  - ref: userInfo
+    required: true
+  - ref: userType
+    required: true

@@ -2,11 +2,20 @@ version: v1
 kind: Schema
 metadata:
   name: relevant
-  description: 共创合约相关人
+  description: 共创合约相关人值对象
   attributes:
   - ref: userId
     required: true
-  - ref: orgnization
+  - ref: usersBaseId
+    required: true
+  - ref: organization
+    description: 用户所属的组织机构
+    required: true
+  - ref: organizations
+    description: 用户关联的组织机构
+    required: true
+  - ref: department
+    description: 用户所属的部门
     required: true
   - ref: role
     required: true

@@ -2,7 +2,7 @@ version: v1
 kind: Schema
 metadata:
   name: role
-  description: 用户角色
+  description: 用户角色值对象
   attributes:
   - ref: roleId
     required: true

+version: v1
+kind: Schema
+metadata:
+  name: salesman
+  description: 业务员值对象
+  attributes:
+  - ref: userId
+    required: true
+  - ref: userBaseId
+    required: true
+  - ref: role
+    required: true
+  - ref: organizations
+    description: 用户关联的组织机构
+    required: true
+  - ref: organization
+    description: 用户所属的组织机构
+    required: true
+  - ref: department
+    description: 用户所属的部门
+    required: true
+  - ref: company
+    required: true
+  - ref: userInfo
+    required: true
+  - ref: userType
+    required: true

@@ -2,14 +2,20 @@ version: v1
 kind: Schema
 metadata:
   name: undertaker
-  description: 共创合约承接方
+  description: 共创合约承接方值对象
   attributes:
   - ref: userId
     required: true
   - ref: usersBaseId
     required: true
   - ref: organization
-    description: 用户关联组织机构
+    description: 用户所属组织机构
+    required: true
+  - ref: organizations
+    description: 用户关联的组织机构
+    required: true
+  - ref: department
+    description: 用户所属的部门
     required: true
   - ref: role
     required: true

@@ -9,13 +9,20 @@ metadata:
   - ref: usersBaseId
     required: true
   - ref: organization
-    description: 用户关联组织机构
+    description: 用户所属组织机构
     required: true
+  - ref: organizations
+    description: 用户关联的组织机构
+    required: true
+  - ref: department
+    description: 用户所属的部门
+    required:
   - ref: role
     required: true
   - ref: userInfo
     required: true
   - ref: userType
+    description: 用户类型
     required: true
   - ref: status
     required: true