allied-creation / document · 提交

转到一个项目

作者 tangxuhui
提交 f7ed3ddd8937cba12c92dcb9933f3530ba537897 1 个父辈 fa731ce4

更新

内嵌 并排对比
正在显示 6 个修改的文件 包含 12 行增加 和 13 行删除
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: avator
  5 + description: 头像
  6 + type:
  7 + primitive: string
@@ -10,7 +10,7 @@ metadata: @@ -10,7 +10,7 @@ metadata:
10 required: true 10 required: true
11 - ref: updatedAt 11 - ref: updatedAt
12 required: true 12 required: true
13 - - ref: avatar 13 + - ref: avator
14 required: true 14 required: true
15 - ref: cooperationCompany 15 - ref: cooperationCompany
16 required: true 16 required: true
@@ -5,7 +5,7 @@ metadata: @@ -5,7 +5,7 @@ metadata:
5 type: command 5 type: command
6 description: 编辑个人资料 6 description: 编辑个人资料
7 payload: 7 payload:
8 - - name: avatar 8 + - name: avator
9 description: 头像地址 9 description: 头像地址
10 type: 10 type:
11 primitive: string 11 primitive: string
@@ -14,7 +14,7 @@ metadata: @@ -14,7 +14,7 @@ metadata:
14 type: 14 type:
15 primitive: string 15 primitive: string
16 result: 16 result:
17 - - name: avatar 17 + - name: avator
18 description: 头像地址 18 description: 头像地址
19 type: 19 type:
20 primitive: string 20 primitive: string
@@ -10,19 +10,11 @@ metadata: @@ -10,19 +10,11 @@ metadata:
10 type: 10 type:
11 primitive: int64 11 primitive: int64
12 result: 12 result:
13 -<<<<<<< .mine  
14 - name: userId 13 - name: userId
15 description: 用户id 14 description: 用户id
16 type: 15 type:
17 primitive: int64 16 primitive: int64
18 - name: avator 17 - name: avator
19 -=======  
20 - - name: avatar  
21 -  
22 -  
23 -  
24 -  
25 ->>>>>>> .theirs  
26 description: 头像地址 18 description: 头像地址
27 type: 19 type:
28 primitive: string 20 primitive: string
@@ -27,7 +27,7 @@ metadata: @@ -27,7 +27,7 @@ metadata:
27 description: 关联的用户 27 description: 关联的用户
28 type: 28 type:
29 array: int64 29 array: int64
30 - - ref: avatar 30 + - ref: avator
31 required: true 31 required: true
32 result: 32 result:
33 - name: usersId 33 - name: usersId
@@ -45,7 +45,7 @@ metadata: @@ -45,7 +45,7 @@ metadata:
45 description: 关联的组织结构 45 description: 关联的组织结构
46 type: 46 type:
47 array: int64 47 array: int64
48 - - name: avatar 48 + - name: avator
49 description: 头像 49 description: 头像
50 type: 50 type:
51 primitive: string 51 primitive: string