mmm-go-pp / terms · 提交

转到一个项目

作者 tangxuhui
提交 c696fa323fc586ca89a4d9670aa474253667afb4 2 个父辈 0e567215 b44911e1

Merge branch 'master' of http://gitlab.fjmaimaimai.com/mmm-go-pp/terms

内嵌 并排对比
正在显示 28 个修改的文件 包含 136 行增加 和 82 行删除
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: configDescption 4 + name: desc
5 description: 参数描述 5 description: 参数描述
6 type: 6 type:
7 primitive: string 7 primitive: string
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: configValue 4 + name: value
5 description: 管控值 5 description: 管控值
6 type: 6 type:
7 primitive: string 7 primitive: string
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: configValueType 4 + name: valueType
5 description: 参数管控层级 (1.字符 2.数值 3.时间) 5 description: 参数管控层级 (1.字符 2.数值 3.时间)
6 type: 6 type:
7 primitive: int 7 primitive: int
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: organizationCode 4 + name: orgCode
5 description: 组织编码 5 description: 组织编码
6 type: 6 type:
7 primitive: string 7 primitive: string
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: organizationName 4 + name: orgName
5 description: 组织名称 5 description: 组织名称
6 type: 6 type:
7 primitive: string 7 primitive: string
@@ -2,6 +2,6 @@ version: v1 @@ -2,6 +2,6 @@ version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 name: usersType 4 name: usersType
5 - description: 用户类型 ： 1：普通用户 2：共创用户 5 + description: 用户类型 ： 1：普通用户 2：共创用户 1024:超级管理员
6 type: 6 type:
7 primitive: int 7 primitive: int
@@ -2,7 +2,7 @@ version: v1 @@ -2,7 +2,7 @@ version: v1
2 kind: Schema 2 kind: Schema
3 metadata: 3 metadata:
4 name: access 4 name: access
5 - description: 权限 （base) 5 + description: 权限 （base) (停用)
6 attributes: 6 attributes:
7 - name: accessId 7 - name: accessId
8 description: 权限Id 8 description: 权限Id
1 version: v1 1 version: v1
2 kind: Schema 2 kind: Schema
3 metadata: 3 metadata:
4 - name: companyCustomer 4 + name: companyCustomer (停用)
5 description: 客户信息 (base) 5 description: 客户信息 (base)
6 attributes: 6 attributes:
7 - ref: companyCustomerId 7 - ref: companyCustomerId
1 version: v1 1 version: v1
2 kind: Schema 2 kind: Schema
3 metadata: 3 metadata:
4 - name: companyProduct 4 + name: companyProduct (停用)
5 description: 产品信息 (base) 5 description: 产品信息 (base)
6 attributes: 6 attributes:
7 - ref: companyProductId 7 - ref: companyProductId
1 version: v1 1 version: v1
2 kind: Schema 2 kind: Schema
3 metadata: 3 metadata:
4 - name: companyRegion 4 + name: companyRegion (停用)
5 description: 公司区域 (base) 5 description: 公司区域 (base)
6 attributes: 6 attributes:
7 - ref: companyRegionId 7 - ref: companyRegionId
1 version: v1 1 version: v1
2 kind: Schema 2 kind: Schema
3 metadata: 3 metadata:
4 - name: systemConfig 4 + name: config
5 description: 系统参数配置 5 description: 系统参数配置
6 attributes: 6 attributes:
7 - ref: configId 7 - ref: configId
@@ -12,9 +12,9 @@ metadata: @@ -12,9 +12,9 @@ metadata:
12 required: true 12 required: true
13 - ref: configLevel 13 - ref: configLevel
14 required: true 14 required: true
15 - - ref: configValueType 15 + - ref: valueType
16 required: true 16 required: true
17 - - ref: configValue 17 + - ref: value
18 required: true 18 required: true
19 - - ref: configDescption 19 + - ref: desc
20 required: true 20 required: true
1 version: v1 1 version: v1
2 kind: Schema 2 kind: Schema
3 metadata: 3 metadata:
4 - name: credentialAuth （base) 4 + name: credentialAuth （base) (停用)
5 description: 凭证认证 5 description: 凭证认证
6 attributes: 6 attributes:
7 - name: credential 7 - name: credential
1 version: v1 1 version: v1
2 kind: Schema 2 kind: Schema
3 metadata: 3 metadata:
4 - name: dataColumnSys  
5 - description: 页面列表数据的输出列的系统全局配置 4 + name: dataColumn
  5 + description: 数据列
6 attributes: 6 attributes:
7 - - name: id  
8 - description: 数据id  
9 - type:  
10 - primitive: int64  
11 - - name: urlCode  
12 - description: 请求url对应的code  
13 - type:  
14 - primitive: int64  
15 - name: dataIndex 7 - name: dataIndex
16 description: 数据列字段代码名称 8 description: 数据列字段代码名称
17 type: 9 type:
1 version: v1 1 version: v1
2 kind: Schema 2 kind: Schema
3 metadata: 3 metadata:
4 - name: dataColumnSys  
5 - description: 页面列表数据的输出列的个人配置 4 + name: dataColumnPerson
  5 + description: 列表设置个人：页面列表数据的输出列的个人配置
6 attributes: 6 attributes:
7 - - name: id 7 + - name: dataColumnPersonId
8 description: 数据id 8 description: 数据id
9 type: 9 type:
10 primitive: int64 10 primitive: int64
11 - - name: urlCode  
12 - description: 请求url对应的code 11 + - name: resource
  12 + description: 资源 （列如表单 user）
13 type: 13 type:
14 - primitive: int64 14 + primitive: string
15 - name: columns 15 - name: columns
16 description: 配置的用户显示的字段,例 `["c1","c2"]`` 16 description: 配置的用户显示的字段,例 `["c1","c2"]``
17 type: 17 type:
18 - primitive: array  
19 - - name: userId 18 + array: string
  19 + - name: usersId
20 description: 归属的用户id 20 description: 归属的用户id
21 type: 21 type:
22 primitive: int64 22 primitive: int64
  1 +version: v1
  2 +kind: Schema
  3 +metadata:
  4 + name: dataColumnSys
  5 + description: 列表设置系统：页面列表数据的输出列的系统全局配置
  6 + attributes:
  7 + - name: dataColumnSysId
  8 + description: 数据id
  9 + type:
  10 + primitive: int64
  11 + - name: resource
  12 + description: 资源 （列如表单 user）
  13 + type:
  14 + primitive: string
  15 + - name: columns
  16 + description: 数据列字段代码名称
  17 + type:
  18 + array: dataColumn
  1 +version: v1
  2 +kind: Schema
  3 +metadata:
  4 + name: dictionary
  5 + description: 字典
  6 + attributes:
  7 + - name: dictionaryId
  8 + description: 字典编号 主键
  9 + type:
  10 + primitive: int
  11 + - name: dictCode
  12 + description: 字典编码
  13 + type:
  14 + primitive: string
  15 + - name: dictName
  16 + description: 字典名称
  17 + type:
  18 + primitive: string
  19 + - name: enableStatus
  20 + description: 启用状态(启用:1 禁用:2)
  21 + type:
  22 + primitive: int
  23 + - name: desc
  24 + description: 备注信息
  25 + type:
  26 + primitive: string
  27 + - name: dictItems
  28 + description: 字典值列表
  29 + type:
  30 + array: dictionaryItem
  1 +version: v1
  2 +kind: Schema
  3 +metadata:
  4 + name: dictionaryItem
  5 + description: 字典明细项
  6 + attributes:
  7 + - name: itemCode
  8 + description: 项编码
  9 + type:
  10 + primitive: string
  11 + - name: itemLabel
  12 + description: 项标签
  13 + type:
  14 + primitive: string
  15 + - name: itemValue
  16 + description: 值
  17 + type:
  18 + primitive: string
  19 + - name: enableStatus
  20 + description: 启用状态(启用:1 禁用:2)
  21 + type:
  22 + primitive: string
  23 + - name: sort
  24 + description: 显示序号
  25 + type:
  26 + primitive: int
@@ -16,26 +16,14 @@ metadata: @@ -16,26 +16,14 @@ metadata:
16 description: 菜单名称 16 description: 菜单名称
17 type: 17 type:
18 primitive: string 18 primitive: string
19 - - name: module  
20 - description: 模块 （首页 INDEX、业务BISINESS、管理MANAGER、报表REPORT）  
21 - type:  
22 - primitive: string  
23 - name: code 19 - name: code
24 - description: 菜单编码 20 + description: 菜单编码 SYSTEM_USER_EDIT (权限编码)
25 type: 21 type:
26 primitive: string 22 primitive: string
27 - name: menuType 23 - name: menuType
28 - description: 菜单类型 （模块module、子模块submodule、菜单menu、按钮button） 24 + description: 菜单类型 （目录catalog、菜单menu、按钮button）
29 type: 25 type:
30 primitive: string 26 primitive: string
31 - - name: status  
32 - description: 菜单状态 bit0:启用(1)/禁用(0) bit1:启用收藏(1)/禁用收藏(0)(默认禁用)  
33 - type:  
34 - primitive: int  
35 - - name: access  
36 - description: 关联权限  
37 - type:  
38 - schema: access  
39 - name: icon 27 - name: icon
40 description: 菜单图标 28 description: 菜单图标
41 type: 29 type:
@@ -48,8 +36,8 @@ metadata: @@ -48,8 +36,8 @@ metadata:
48 description: 菜单说明 36 description: 菜单说明
49 type: 37 type:
50 primitive: string 38 primitive: string
51 - - name: tag  
52 - description: 菜单标签 （web、app） 39 + - name: category
  40 + description: 菜单类别 （web:1、app:2）
53 type: 41 type:
54 primitive: string 42 primitive: string
55 - name: parentPath 43 - name: parentPath
@@ -57,6 +45,10 @@ metadata: @@ -57,6 +45,10 @@ metadata:
57 type: 45 type:
58 primitive: string 46 primitive: string
59 - name: isPublish 47 - name: isPublish
60 - description: 是否是公开的菜单，[0:否],[1:是],默认否 48 + description: 菜单是否公开状态，[0:隐藏],[1:显示],默认显示
  49 + type:
  50 + primitive: int
  51 + - name: isSystem
  52 + description: 菜单是否是系统级，[0:否],[1:是],默认否
61 type: 53 type:
62 primitive: int 54 primitive: int
@@ -14,9 +14,9 @@ metadata: @@ -14,9 +14,9 @@ metadata:
14 required: true 14 required: true
15 - ref: deleteAt 15 - ref: deleteAt
16 required: true 16 required: true
17 - - ref: organizationCode 17 + - ref: orgCode
18 required: true 18 required: true
19 - - ref: organizationName 19 + - ref: orgName
20 required: true 20 required: true
21 - name: isOrg 21 - name: isOrg
22 description: 是否是组织 22 description: 是否是组织
1 -version: v1  
2 -kind: Schema  
3 -metadata:  
4 - name: organizationRole  
5 - description: 组织权限  
6 - attributes:  
7 - - ref: organizationId  
8 - required: true  
9 - - name: roles  
10 - description: 角色列表  
11 - type:  
12 - array: int64  
@@ -8,15 +8,21 @@ metadata: @@ -8,15 +8,21 @@ metadata:
8 required: true 8 required: true
9 - ref: companyId 9 - ref: companyId
10 required: true 10 required: true
11 - - ref: organizationId  
12 - required: true 11 + - name: organization
  12 + description: 组织信息
  13 + type:
  14 + schema: organization
13 - ref: roleName 15 - ref: roleName
14 required: true 16 required: true
15 - name: menuAccess 17 - name: menuAccess
16 description: 菜单权限列表 18 description: 菜单权限列表
17 type: 19 type:
18 array: int64 20 array: int64
19 - - name: description  
20 - description: 描述 21 + - name: desc
  22 + description: 角色描述
21 type: 23 type:
22 primitive: string 24 primitive: string
  25 + - ref: createAt
  26 + required: true
  27 + - ref: updateAt
  28 + required: true
@@ -18,7 +18,7 @@ metadata: @@ -18,7 +18,7 @@ metadata:
18 description: 手机认证 18 description: 手机认证
19 type: 19 type:
20 schemal: phoneAuth 20 schemal: phoneAuth
21 - - name: credentialAuths  
22 - description: 凭证认证  
23 - type:  
24 - array: credentialAuth 21 + - ref: createAt
  22 + required: true
  23 + - ref: updateAt
  24 + required: true
@@ -19,23 +19,27 @@ metadata: @@ -19,23 +19,27 @@ metadata:
19 - name: organization 19 - name: organization
20 description: 组织机构 20 description: 组织机构
21 type: 21 type:
22 - primitive: int64 22 + schema: organization
23 - name: department 23 - name: department
24 description: 所属部门 24 description: 所属部门
25 type: 25 type:
26 - primitive: int64  
27 - - name: organizationRoles  
28 - description: 组织权限列表 26 + schema: organization
  27 + - name: usersOrg
  28 + description: 用户关联的组织
29 type: 29 type:
30 - array: organizationRole 30 + array: int64
  31 + - name: usersRole
  32 + description: 用户关联的角色
  33 + type:
  34 + array: int64
31 - name: collectedMenus 35 - name: collectedMenus
32 description: 收藏的菜单(工作台) 36 description: 收藏的菜单(工作台)
33 type: 37 type:
34 - array: access 38 + array: menu
35 - name: cooperationInfo 39 - name: cooperationInfo
36 description: 共创信息 （共创用户有效） 40 description: 共创信息 （共创用户有效）
37 type: 41 type:
38 - primitive: cooperationInfo 42 + schema: cooperationInfo
39 - name: enableStatus 43 - name: enableStatus
40 description: 启用状态(启用:1 禁用:2) 44 description: 启用状态(启用:1 禁用:2)
41 type: 45 type:
@@ -48,5 +52,3 @@ metadata: @@ -48,5 +52,3 @@ metadata:
48 required: true 52 required: true
49 - ref: updateAt 53 - ref: updateAt
50 required: true 54 required: true
51 - - ref: deleteAt  
52 - required: true  
@@ -2,7 +2,7 @@ version: v1 @@ -2,7 +2,7 @@ version: v1
2 kind: Schema 2 kind: Schema
3 metadata: 3 metadata:
4 name: usersInfo 4 name: usersInfo
5 - description: 用户信息 5 + description: 用户信息 (base)
6 attributes: 6 attributes:
7 - ref: usersName 7 - ref: usersName
8 required: true 8 required: true