更新

+version: v1
+kind: Attribute
+metadata:
+  name: avator
+  description: 头像
+  type: 
+    primitive: string

@@ -10,7 +10,7 @@ metadata:
       required: true
     - ref: updatedAt
       required: true
-    - ref: avatar
+    - ref: avator
       required: true
     - ref: cooperationCompany
       required: true

@@ -5,7 +5,7 @@ metadata:
   type: command
   description: 编辑个人资料
   payload:
-    - name: avatar
+    - name: avator
       description: 头像地址
       type:
         primitive: string
@@ -14,7 +14,7 @@ metadata:
       type:
         primitive: string
   result:
-    - name: avatar
+    - name: avator
       description: 头像地址
       type:
         primitive: string

@@ -10,19 +10,11 @@ metadata:
       type:
         primitive: int64
   result:
-<<<<<<< .mine
     - name: userId
       description: 用户id
       type:
         primitive: int64
     - name: avator
-=======
-    - name: avatar
-
-
-
-
->>>>>>> .theirs
       description: 头像地址
       type:
         primitive: string

@@ -27,7 +27,7 @@ metadata:
       description: 关联的用户
       type:
         array: int64
-    - ref: avatar
+    - ref: avator
       required: true
   result:
     - name: usersId

@@ -45,7 +45,7 @@ metadata:
       description: 关联的组织结构
       type:
         array: int64
-    - name: avatar
+    - name: avator
       description: 头像
       type:
         primitive: string