allied-creation / document · 提交

转到一个项目

作者 yangfu
提交 be297328ddfdfbbb5a7400e19dba9e6e29b388d0 2 个父辈 83aab32a 68385f34

Merge branch 'master' of http://gitlab.fjmaimaimai.com/allied-creation/document

内嵌 并排对比
正在显示 100 个修改的文件 包含 1078 行增加 和 6 行删除

要显示太多修改。
重新载入完整差异 差异文件 邮件补丁

为保证性能只显示 100 of 100+ 个文件。

... ... @@ -22,7 +22,7 @@ metadata:
primitive: string
- name: canDelete
description: 是否可以删除【1：不可以】【2：可以】
typee:
type:
primitive: int
- name: canEdit
description: 是否可以编辑【1：不可以】【2：可以】
... ...
version: v1
kind: Attribute
metadata:
name: feedbackAttachment
description: 合约承接方反馈内容附件
type:
array: string
... ...
version: v1
kind: Attribute
metadata:
name: feedbackContent
description: 合约承接方反馈内容
type:
primitive: string
... ...
version: v1
kind: Attribute
metadata:
name: feedbackId
description: 合约承接方反馈记录ID
type:
primitive: int64
... ...
version: v1
kind: Attribute
metadata:
name: creditAccountId
description: 账期结算记录ID
type:
primitive: int64
... ...
version: v1
kind: Attribute
metadata:
name: dividendsEstimateId
description: 分红预算记录ID
type:
primitive: int64
... ...
version: v1
kind: Attribute
metadata:
name: dividendsPercent
name: dividendsPercentage
description: 分红规则激励百分点
type:
primitive: float64
... ...
version: v1
kind: Attribute
metadata:
name: dividendsReferrerPercent
description: 分红激励规则推荐人抽成比例
name: referrerPercentage
description: 推荐人抽成比例
type:
primitive: float64
... ...
version: v1
kind: Attribute
metadata:
name: dividendsSalesmanPercent
description: 分红激励规则业务员抽成比例
name: salesmanPercentage
description: 业务员抽成比例
type:
primitive: float64
... ...
version: v1
kind: Attribute
metadata:
name: dividendsReturnedId
description: 分红退货单记录ID
type:
primitive: string
... ...
version: v1
kind: Attribute
metadata:
name: orderNum
description: 来源单号，源单号，订单号
type:
primitive: string
... ...
version: v1
kind: Attribute
metadata:
name: organizationId
description: 组织机构ID
type:
primitive: int64
... ...
version: v1
kind: Attribute
metadata:
name: regionId
description: 区域ID
type:
primitive: int64
... ...
version: v1
kind: Attribute
metadata:
name: regionName
description: 区域名称
type:
primitive: string
... ...
version: v1
kind: Attribute
metadata:
name: roleId
description: 角色ID
type:
primitive: int64
... ...
version: v1
kind: Attribute
metadata:
name: company
description: 公司
type:
schema: company
... ...
version: v1
kind: Attribute
metadata:
name: organization
description: 用户所属组织机构
type:
schema: organization
... ...
version: v1
kind: Attribute
metadata:
name: role
description: 用户角色
type:
schema: role
... ...
version: v1
kind: Attribute
metadata:
name: userInfo
description: 用户信息冗余字段
type:
schema: userInfo
... ...
version: v1
kind: Attribute
metadata:
name: userEmail
description: 用户邮箱
type:
primitive: string
... ...
version: v1
kind: Schema
metadata:
name: company
description: 公司值对象
attributes:
- ref: companyId
required: true
- ref: companyLogo
required: true
- ref: companyName
required: true
... ...
version: v1
kind: Schema
metadata:
name: contractUndertakerFeedback
description: 承接人反馈信息
attributes:
- ref: feedbackId
required: true
- ref: feedbackAttachment
required: true
- ref: feedbackContent
required: true
- ref: creationContractNumber
required: true
- ref: userId
required: true
... ...
version: v1
kind: Schema
metadata:
name: dividendsIncentivesRules
description: 金额激励规则实体
attributes:
- ref: dividendsIncentivesRuleId
required: true
- ref: referrerPercentage
required: true
- ref: salesmanPercentage
required: true
- ref: dividendsIncentivesPercentage
required: true
- ref: dividendsIncentivesStage
required: true
- ref: dividendsIncentivesStageEnd
required: true
- ref: dividendsIncentivesStageStart
required: true
... ...
version: v1
kind: Schema
metadata:
name: moneyIncentivesRules
description: 金额激励规则实体
attributes:
- ref: moneyIncentivesRuleId
required: true
- ref: moneyIncentivesAmount
required: true
- ref: moneyIncentivesStage
required: true
- ref: moneyIncentivesStageEnd
required: true
- ref: moneyIncentivesStageStart
required: true
- ref: moneyIncentivesTime
required: true
- ref: referrerPercentage
required: true
- ref: salesmanPercentage
required: true
... ...
version: v1
kind: Schema
metadata:
name: organization
description: 组织机构值对象
attributes:
- ref: organizationId
required: true
... ...
version: v1
kind: Schema
metadata:
name: regionInfo
description: 区域信息值对象
attributes:
- ref: regionId
required: true
- ref: regionName
required: true
... ...
version: v1
kind: Schema
metadata:
name: role
description: 用户角色
attributes:
- ref: roleId
required: true
... ...
version: v1
kind: Schema
metadata:
name: user
description: 用户第三方服务防腐模型
attributes:
- ref: userId
required: true
- ref: orgnization
required: true
- ref: role
required: true
- ref: userInfo
required: true
- ref: userType
required: true
- ref: status
required: true
- ref: company
required: true
... ...
version: v1
kind: Schema
metadata:
name: userInfo
description: 用户信息值对象
attributes:
- ref: userAvator
required: true
- ref: userEmail
required: true
- ref: userName
required: true
- ref: userPhone
required: true
... ...
version: v1
kind: Attribute
metadata:
name: address
description: 公司地址
type:
primitive: string
... ...
version: v1
kind: Attribute
metadata:
name: businessLicense
description: 营业执照
type:
primitive: string
... ...
version: v1
kind: Attribute
metadata:
name: companyId
description: 企业id
type:
primitive: int64
... ...
version: v1
kind: Attribute
metadata:
name: companyName
description: 企业名称
type:
primitive: string
... ...
version: v1
kind: Attribute
metadata:
name: contacts
description: 联系人
type:
primitive: string
... ...
version: v1
kind: Attribute
metadata:
name: industryCategory
description: 所属行业
type:
primitive: string
... ...
version: v1
kind: Attribute
metadata:
name: logo
description: 公司Logo地址
type:
primitive: string
... ...
version: v1
kind: Attribute
metadata:
name: registStatus
description: 注册状态 1:已注册 2：待认证 3：已认证
type:
primitive: int
... ...
version: v1
kind: Attribute
metadata:
name: scale
description: 规模
type:
primitive: string
... ...
version: v1
kind: Attribute
metadata:
name: taxpayerCode
description: 纳税人识别号
type:
primitive: string
... ...
version: v1
kind: Attribute
metadata:
name: accessCode
description: 权限编码 users:edit
type:
primitive: string
... ...
version: v1
kind: Attribute
metadata:
name: code
description: 菜单编码 SYSTEM_USER_EDIT
type:
primitive: string
... ...
version: v1
kind: Attribute
metadata:
name: icon
description: 菜单图标
type:
primitive: string
... ...
version: v1
kind: Attribute
metadata:
name: isPublish
description: 菜单是否公开状态(上架、下架)，[0:隐藏],[1:显示],默认显示
type:
primitive: int
... ...
version: v1
kind: Attribute
metadata:
name: menuId
description: 菜单编号
type:
primitive: int64
... ...
version: v1
kind: Attribute
metadata:
name: menuName
description: 菜单名称
type:
primitive: string
... ...
version: v1
kind: Attribute
metadata:
name: menuType
description: 菜单类型 （目录catalog、菜单menu、按钮button）
type:
primitive: string
... ...
version: v1
kind: Attribute
metadata:
name: remark
description: 菜单说明
type:
primitive: string
... ...
version: v1
kind: Attribute
metadata:
name: depName
description: 部门名称
type:
primitive: string
... ...
version: v1
kind: Attribute
metadata:
name: isOrg
description: 是否是组织(是:1 不是:0)
type:
primitive: int
... ...
version: v1
kind: Attribute
metadata:
name: orgCode
description: 组织编码
type:
primitive: string
... ...
version: v1
kind: Attribute
metadata:
name: orgId
description: 组织ID
type:
primitive: int64
... ...
version: v1
kind: Attribute
metadata:
name: orgName
description: 组织名称
type:
primitive: string
... ...
version: v1
kind: Attribute
metadata:
name: accessMenus
description: 有权限的菜单
type:
primitive: int64
... ...
version: v1
kind: Attribute
metadata:
name: roleId
description: 角色ID
type:
primitive: int64
... ...
version: v1
kind: Attribute
metadata:
name: roleName
description: 角色名称
type:
primitive: string
... ...
version: v1
kind: Attribute
metadata:
name: avator
description: 头像
type:
primitive: string
... ...
version: v1
kind: Attribute
metadata:
name: email
description: 邮箱
type:
primitive: string
... ...
version: v1
kind: Attribute
metadata:
name: enableStatus
description: 启用状态(启用:1 禁用:2)
type:
primitive: int
... ...
version: v1
kind: Attribute
metadata:
name: favoriteMenus
description: 收藏的菜单(工作台)(菜单编码列表)
type:
array: string
... ...
version: v1
kind: Attribute
metadata:
name: password
description: 密码
type:
primitive: string
... ...
version: v1
kind: Attribute
metadata:
name: phone
description: 手机号码
type:
primitive: string
... ...
version: v1
kind: Attribute
metadata:
name: status
description: 用户状态
type:
primitive: int
... ...
version: v1
kind: Attribute
metadata:
name: usersBaseId
description: 用户基础数据id
type:
primitive: int64
... ...
version: v1
kind: Attribute
metadata:
name: usersCode
description: 用户编号
type:
primitive: string
... ...
version: v1
kind: Attribute
metadata:
name: usersCompanyId
description: 用户公司编号
type:
primitive: int64
... ...
version: v1
kind: Attribute
metadata:
name: usersId
description: 用户编号
type:
primitive: int64
... ...
version: v1
kind: Attribute
metadata:
name: usersName
description: 用户姓名
type:
primitive: string
... ...
version: v1
kind: Attribute
metadata:
name: usersOrg
description: 用户关联的组织
type:
array: int64
... ...
version: v1
kind: Attribute
metadata:
name: usersRole
description: 用户关联的角色
type:
array: int64
... ...
version: v1
kind: Attribute
metadata:
name: usersType
description: 用户类型 1：企业内部用户（内部添加） 2：共创用户 1024:企业注册用户（注册添加）
type:
primitive: int
... ...
version: v1
kind: Schema
metadata:
name: company
description: 公司
attributes:
- ref: createdAt
required: true
- ref: updatedAt
required: true
- ref: address
required: true
- ref: businessLicense
required: true
- ref: companyId
required: true
- ref: companyName
required: true
- ref: contacts
required: true
- ref: industryCategory
required: true
- ref: logo
required: true
- ref: registStatus
required: true
- ref: taxpayerCode
required: true
- ref: scale
required: true
... ...
version: v1
kind: Schema
metadata:
name: ext
description: 冗余附加数据
attributes:
- ref: usersName
required: true
- ref: orgName
required: true
- ref: phone
required: true
- ref: depName
required: true
- name: parentDepName
description: 父级部门名称
type:
primitive: string
required: true
... ...
version: v1
kind: Schema
metadata:
name: menu
description: 系统菜单
attributes:
- ref: menuId
required: true
- ref: parentId
required: true
- ref: menuName
required: true
- ref: code
required: true
- ref: accessCode
required: true
- ref: menuType
required: true
- ref: icon
required: true
- ref: sort
required: true
- ref: remark
required: true
- name: category
description: 菜单类别 （web:1、app:2）
type:
primitive: string
- name: parentPath
description: 父级节点路径("0,11,12,")
type:
primitive: string
- ref: enableStatus
description: 启用状态(启用:1 禁用:0)
required: true
- ref: isPublish
required: true
... ...
version: v1
kind: Schema
metadata:
name: org
description: 组织 organization
attributes:
- ref: orgId
required: true
- ref: companyId
required: true
- ref: createAt
required: true
- ref: updateAt
required: true
- ref: deleteAt
required: true
- ref: orgCode
required: true
- ref: orgName
required: true
- name: isOrg
required: true
- ref: parentId
required: true
... ...
version: v1
kind: Schema
metadata:
name: orgListItem
description: 组织列表项
attributes:
- ref: orgId
required: true
- ref: companyId
required: true
- ref: createAt
required: true
- ref: updateAt
required: true
- ref: orgCode
required: true
- ref: orgName
required: true
- name: isOrg
required: true
- ref: parentId
required: true
- name: parentName
description: 父级部门名称
type:
primitive: string
... ...
version: v1
kind: Schema
metadata:
name: role
description: 角色 （base)
attributes:
- ref: roleId
required: true
- ref: companyId
required: true
- ref: orgId
required: true
- ref: roleName
required: true
- ref: accessMenus
required: true
- ref: desc
required: true
- ref: createAt
required: true
- ref: updateAt
required: true
... ...
version: v1
kind: Schema
metadata:
name: userListItem
description: 用户列表
attributes:
- ref: usersId
required: true
- ref: usersCode
required: true
- name: phone
description: 手机号
type:
primitive: string
- name: departmentName
description: 部门名称
type:
primitive: string
- name: orgName
description: 组织名称
type:
primitive: string
- name: enableStatus
description: 启用状态(启用:1 禁用:2)
type:
primitive: int
- name: enableStatusMsg
description: 启用状态名称
type:
primitive: string
... ...
version: v1
kind: Schema
metadata:
name: users
description: 用户
attributes:
- ref: usersId
required: true
- ref: companyId
required: true
- ref: usersBaseId
required: true
- ref: usersType
required: true
- ref: usersCode
required: true
- name: organizationId
description: 组织机构
type:
primitive: int64
- name: departmentId
description: 所属部门
type:
primitive: int64
- name: usersOrg
description: 用户关联的组织
type:
array: org
- name: usersRole
description: 用户关联的角色
type:
array: role
- name: favoriteMenus
description: 收藏的菜单(工作台)(菜单编码列表)
type:
array: string
- name: cooperationInfo
description: 共创信息 （共创用户有效）
type:
schema: cooperationInfo
- name: enableStatus
description: 启用状态(启用:1 禁用:2)
type:
primitive: int
- ref: createAt
required: true
- ref: updateAt
required: true
... ...
version: v1
kind: Schema
metadata:
name: usersBase
description: 用户（base)
attributes:
- ref: usersBaseId
required: true
- name: usersInfo
description: 用户信息
type:
schema: usersInfo
- name: phoneAuth
description: 手机认证
type:
schemal: phoneAuth
- name: im
description: IM信息
type:
schemal: im
- name: relatedUsers
description: 关联的用户 (冗余)
type:
array: int64
- ref: createAt
required: true
- ref: updateAt
required: true
\ No newline at end of file
... ...
version: v1
kind: Schema
metadata:
name: usersInfo
description: 用户信息 (base)
attributes:
- ref: usersName
required: true
- ref: phone
required: true
- ref: avator
required: true
- ref: email
required: true
... ...
version: v1
kind: Method
metadata:
name: createOrg
type: command
description: 创建组织管理
payload:
- ref: companyId
required: true
- ref: orgCode
required: true
- ref: orgName
required: true
- name: isOrg
required: true
- ref: parentId
required: true
result:
- name: org
type:
schema: org
required: true
... ...
version: v1
kind: Method
metadata:
name: getOrg
type: query
description: 返回组织管理
payload:
- ref: orgId
required: true
result:
- name: org
type:
schema: org
required: true
... ...
version: v1
kind: Method
metadata:
name: listOrg
type: query
description: 返回组织管理列表
payload:
- ref: offset
required: true
- ref: limit
required: true
- ref: orgCode
required: false
- ref: depName
required: false
- ref: parentId
required: false
result:
- ref: count
required: true
- name: orgs
type:
array: org
required: true
... ...
version: v1
kind: Method
metadata:
name: removeOrg
type: command
description: 移除组织管理
payload:
- ref: orgId
required: true
result:
- name: org
type:
schema: org
required: true
... ...
version: v1
kind: Method
metadata:
name: updateOrg
type: command
description: 更新组织管理
payload:
- ref: orgId
required: true
- ref: orgCode
required: true
- ref: orgName
required: true
- name: isOrg
required: true
- ref: parentId
required: true
result:
- name: org
type:
schema: org
required: true
... ...
version: v1
kind: Service
metadata:
name: org
description: 组织管理
... ...
version: v1
kind: Method
metadata:
name: batchResetPassword
type: command
description: 批量重置密码
payload:
- name: usersIds
type:
array: int64
required: true
- ref: password
required: true
result:
- name: usersId
type:
primitive: int64
required: true
... ...
version: v1
kind: Method
metadata:
name: createUsers
type: command
description: 创建用户信息
payload:
- name: usersCode
description: 用户编号
type:
primitive: string
- name: usersName
description: 用户名称
type:
primitive: string
- name: organizationId
description: 组织机构id
type:
primitive: int64
- name: departmentId
description: 部门id
type:
primitive: int64
- name: enableStatus
description: 启用状态(启用:1 禁用:2)
type:
primitive: int
- name: phone
description: 手机号
type:
primitive: string
- name: email
description: 邮箱
type:
primitive: string
- name: usersOrg
description: 关联的组织机构
type:
array: org
- name: usersRole
description: 关联的组织结构
type:
array: role
- name: avator
description: 头像
type:
primitive: string
result:
- name: usersId
type:
primitive: int64
required: true
... ...
version: v1
kind: Method
metadata:
name: enableUsers
type: command
description: 启用禁用用户信息
payload:
- ref: usersId
required: true
- name: enableStatus
description: 启用状态(启用:1 禁用:2)
type:
primitive: int
result:
- name: users
type:
schema: users
required: true
... ...
version: v1
kind: Method
metadata:
name: getUsers
type: query
description: 返回用户信息
payload:
- ref: usersId
required: true
result:
- name: usersCode
description: 用户编号
type:
primitive: string
- name: usersName
description: 用户名称
type:
primitive: string
- name: orgId
description: 组织机构id
type:
primitive: int64
- name: orgName
description: 组织机构名称
type:
primitive: string
- name: departmentId
description: 部门id
type:
primitive: int64
- name: departmentName
description: 部门名称
type:
primitive: int64
- name: enableStatus
description: 启用状态(启用:1 禁用:2)
type:
primitive: int
- name: phone
description: 手机号
type:
primitive: string
- name: email
description: 邮箱
type:
primitive: string
- name: usersOrg
description: 关联的组织机构
type:
array: org
- name: usersRole
description: 关联的角色
type:
array: role
- name: avator
description: 头像
type:
primitive: string
... ...
version: v1
kind: Method
metadata:
name: listUsers
type: query
description: 返回用户信息列表
payload:
- ref: offset
required: true
- ref: limit
required: true
result:
- ref: count
required: true
- name: userList
type:
array: userListItem
required: true
... ...