作者 陈志颖

Merge branch 'dev'

1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: IsOrganization 4 + name: isOrganization
5 description: 是否组织机构标识,1为是,2为否,默认为否 5 description: 是否组织机构标识,1为是,2为否,默认为否
6 type: 6 type:
7 primitive: boolean 7 primitive: boolean
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: dividendsPercentage 4 + name: dividendsIncentivesPercentage
5 description: 分红规则激励百分点 5 description: 分红规则激励百分点
6 type: 6 type:
7 primitive: float64 7 primitive: float64
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: dividendsRuleId 4 + name: dividendsIncentivesRuleId
5 description: 分红规则ID 5 description: 分红规则ID
6 type: 6 type:
7 primitive: int64 7 primitive: int64
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: dividendsStage 4 + name: dividendsIncentivesStage
5 description: 分红规则激励阶段,阶段返回时需要转换为中文数字 5 description: 分红规则激励阶段,阶段返回时需要转换为中文数字
6 type: 6 type:
7 primitive: int64 7 primitive: int64
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: dividendsStageEnd 4 + name: dividendsIncentivesStageEnd
5 description: 分红规则激励阶段结束 5 description: 分红规则激励阶段结束
6 type: 6 type:
7 primitive: datetime 7 primitive: datetime
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: dividendsStageStart 4 + name: dividendsIncentivesStageStart
5 description: 分红规则激励阶段开始 5 description: 分红规则激励阶段开始
6 type: 6 type:
7 primitive: datetime 7 primitive: datetime
1 -version: v1  
2 -kind: Attribute  
3 -metadata:  
4 - name: userAccount  
5 - description: 用户账号  
6 - type:  
7 - primitive: string  
@@ -10,5 +10,5 @@ metadata: @@ -10,5 +10,5 @@ metadata:
10 required: true 10 required: true
11 - ref: departmentNumber 11 - ref: departmentNumber
12 required: true 12 required: true
13 - - ref: IsOrganization 13 + - ref: isOrganization
14 required: true 14 required: true
1 version: v1 1 version: v1
2 kind: Schema 2 kind: Schema
3 metadata: 3 metadata:
4 - name: dividendsIncentivesRule 4 + name: dividendsIncentivesRules
5 description: 金额激励规则DTO 5 description: 金额激励规则DTO
6 attributes: 6 attributes:
7 - ref: referrerPercentage 7 - ref: referrerPercentage
1 version: v1 1 version: v1
2 kind: Schema 2 kind: Schema
3 metadata: 3 metadata:
4 - name: moneyIncentivesRule 4 + name: moneyIncentivesRules
5 description: 金额激励规则DTO 5 description: 金额激励规则DTO
6 attributes: 6 attributes:
7 - ref: moneyIncentivesAmount 7 - ref: moneyIncentivesAmount
1 version: v1 1 version: v1
2 kind: Schema 2 kind: Schema
3 metadata: 3 metadata:
4 - name: orderGood 4 + name: orderGoods
5 description: 订单产品对象 5 description: 订单产品对象
6 attributes: 6 attributes:
7 - ref: orderGoodAmount 7 - ref: orderGoodAmount
@@ -8,7 +8,7 @@ metadata: @@ -8,7 +8,7 @@ metadata:
8 - ref: cooperationContractId 8 - ref: cooperationContractId
9 required: true 9 required: true
10 - name: sponsorUid 10 - name: sponsorUid
11 - description: Attribute描述 11 + description: 发起人uid
12 type: 12 type:
13 primitive: string 13 primitive: string
14 result: 14 result:
@@ -7,7 +7,7 @@ metadata: @@ -7,7 +7,7 @@ metadata:
7 payload: 7 payload:
8 - ref: creditAccountOrderNum 8 - ref: creditAccountOrderNum
9 required: true 9 required: true
10 - - name: participartorName 10 + - name: participatorName
11 description: 参与人姓名 11 description: 参与人姓名
12 type: 12 type:
13 primitive: string 13 primitive: string
@@ -18,11 +18,11 @@ metadata: @@ -18,11 +18,11 @@ metadata:
18 - ref: remarks 18 - ref: remarks
19 required: true 19 required: true
20 - name: salesmanUid 20 - name: salesmanUid
21 - description: Attribute描述 21 + description: 业务员uid
22 type: 22 type:
23 primitive: string 23 primitive: string
24 - name: operatorUid 24 - name: operatorUid
25 - description: Attribute描述 25 + description: 操作人uid
26 type: 26 type:
27 primitive: string 27 primitive: string
28 result: 28 result: