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

@@ -3,5 +3,5 @@ kind: Attribute
 metadata:
 metadata:
   name: configCode
   name: configCode
   description: 参数编码
   description: 参数编码
-  type: 
+  type:
     primitive: string
     primitive: string

 version: v1
 version: v1
 kind: Attribute
 kind: Attribute
 metadata:
 metadata:
-  name: configDescption
+  name: desc
   description: 参数描述
   description: 参数描述
   type: 
   type: 
     primitive: string
     primitive: string

 version: v1
 version: v1
 kind: Attribute
 kind: Attribute
 metadata:
 metadata:
-  name: configValue
+  name: value
   description: 管控值 
   description: 管控值 
   type: 
   type: 
     primitive: string
     primitive: string

 version: v1
 version: v1
 kind: Attribute
 kind: Attribute
 metadata:
 metadata:
-  name: configValueType
+  name: valueType
   description: 参数管控层级 (1.字符 2.数值 3.时间)
   description: 参数管控层级 (1.字符 2.数值 3.时间)
   type: 
   type: 
     primitive: int
     primitive: int

 version: v1
 version: v1
 kind: Attribute
 kind: Attribute
 metadata:
 metadata:
-  name: organizationCode
+  name: orgCode
   description: 组织编码
   description: 组织编码
   type: 
   type: 
     primitive: string
     primitive: string

 version: v1
 version: v1
 kind: Attribute
 kind: Attribute
 metadata:
 metadata:
-  name: organizationName
+  name: orgName
   description: 组织名称
   description: 组织名称
-  type: 
+  type:
     primitive: string
     primitive: string

@@ -2,6 +2,6 @@ version: v1
 kind: Attribute
 kind: Attribute
 metadata:
 metadata:
   name: usersType
   name: usersType
-  description: 用户类型 ： 1：普通用户 2：共创用户
-  type: 
+  description: 用户类型 ： 1：普通用户 2：共创用户   1024:超级管理员
+  type:
     primitive: int
     primitive: int

@@ -2,7 +2,7 @@ version: v1
 kind: Schema
 kind: Schema
 metadata:
 metadata:
   name: access
   name: access
-  description: 权限 （base)
+  description: 权限 （base) (停用)
   attributes:
   attributes:
     - name: accessId
     - name: accessId
       description: 权限Id
       description: 权限Id

 version: v1
 version: v1
 kind: Schema
 kind: Schema
 metadata:
 metadata:
-  name: companyCustomer
+  name: companyCustomer  (停用)
   description: 客户信息 (base)
   description: 客户信息 (base)
   attributes:
   attributes:
-  - ref: companyCustomerId
-    required: true
-  - ref: companyId
-    required: true
-  - ref: customerCode
-    required: true
-  - ref: customerName
-    required: true
+    - ref: companyCustomerId
+      required: true
+    - ref: companyId
+      required: true
+    - ref: customerCode
+      required: true
+    - ref: customerName
+      required: true

 version: v1
 version: v1
 kind: Schema
 kind: Schema
 metadata:
 metadata:
-  name: companyProduct
+  name: companyProduct  (停用)
   description: 产品信息 (base)
   description: 产品信息 (base)
   attributes:
   attributes:
-  - ref: companyProductId
-    required: true
-  - ref: companyId
-    required: true       
-  - ref: productCode
-    required: true
-  - ref: productName
-    required: true
+    - ref: companyProductId
+      required: true
+    - ref: companyId
+      required: true
+    - ref: productCode
+      required: true
+    - ref: productName
+      required: true

 version: v1
 version: v1
 kind: Schema
 kind: Schema
 metadata:
 metadata:
-  name: companyRegion
+  name: companyRegion  (停用)
   description: 公司区域 (base)
   description: 公司区域 (base)
   attributes:
   attributes:
-  - ref: companyRegionId
-    required: true
-  - ref: companyId
-    required: true    
-  - ref: regionCode
-    required: true
-  - ref: regionName
-    required: true
-  - ref: parentRegionId
-    required: true
-  - ref: remark
-    required: true
+    - ref: companyRegionId
+      required: true
+    - ref: companyId
+      required: true
+    - ref: regionCode
+      required: true
+    - ref: regionName
+      required: true
+    - ref: parentRegionId
+      required: true
+    - ref: remark
+      required: true

 version: v1
 version: v1
 kind: Schema
 kind: Schema
 metadata:
 metadata:
-  name: systemConfig
+  name: config
   description: 系统参数配置
   description: 系统参数配置
   attributes:
   attributes:
-  - ref: configId
-    required: true
-  - ref: configCode
-    required: true
-  - ref: configName
-    required: true
-  - ref: configLevel
-    required: true
-  - ref: configValueType
-    required: true
-  - ref: configValue
-    required: true
-  - ref: configDescption
-    required: true
+    - ref: configId
+      required: true
+    - ref: configCode
+      required: true
+    - ref: configName
+      required: true
+    - ref: configLevel
+      required: true
+    - ref: valueType
+      required: true
+    - ref: value
+      required: true
+    - ref: desc
+      required: true

 version: v1
 version: v1
 kind: Schema
 kind: Schema
 metadata:
 metadata:
-  name: credentialAuth （base)
+  name: credentialAuth （base) (停用)
   description: 凭证认证
   description: 凭证认证
   attributes:
   attributes:
-  - name: credential
-    description: 凭证
-    type: 
-      primitive: string
-  - name: deviceType
-    description: 设备类型
-    type: 
-      primitive: string
-  - name: expire
-    description: 过期时间蹉（unix）
-    type: 
-      primitive: int64
+    - name: credential
+      description: 凭证
+      type:
+        primitive: string
+    - name: deviceType
+      description: 设备类型
+      type:
+        primitive: string
+    - name: expire
+      description: 过期时间蹉（unix）
+      type:
+        primitive: int64

 version: v1
 version: v1
 kind: Schema
 kind: Schema
 metadata:
 metadata:
-  name: dataColumnSys
-  description: 页面列表数据的输出列的系统全局配置
+  name: dataColumn
+  description: 数据列
   attributes:
   attributes:
-    - name: id
-      description: 数据id
-      type:
-        primitive: int64
-    - name: urlCode
-      description: 请求url对应的code
-      type:
-        primitive: int64
     - name: dataIndex
     - name: dataIndex
       description: 数据列字段代码名称
       description: 数据列字段代码名称
       type:
       type:

 version: v1
 version: v1
 kind: Schema
 kind: Schema
 metadata:
 metadata:
-  name: dataColumnSys
-  description: 页面列表数据的输出列的个人配置
+  name: dataColumnPerson
+  description: 列表设置个人：页面列表数据的输出列的个人配置
   attributes:
   attributes:
-    - name: id
+    - name: dataColumnPersonId
       description: 数据id
       description: 数据id
       type:
       type:
         primitive: int64
         primitive: int64
-    - name: urlCode
-      description: 请求url对应的code
+    - name: resource
+      description: 资源 （列如表单 user）
       type:
       type:
-        primitive: int64
+        primitive: string
     - name: columns
     - name: columns
       description: 配置的用户显示的字段,例 `["c1","c2"]``
       description: 配置的用户显示的字段,例 `["c1","c2"]``
       type:
       type:
-        primitive: array
-    - name: userId
+        array: string
+    - name: usersId
       description: 归属的用户id
       description: 归属的用户id
       type:
       type:
         primitive: int64
         primitive: int64

+version: v1
+kind: Schema
+metadata:
+  name: dataColumnSys
+  description: 列表设置系统：页面列表数据的输出列的系统全局配置
+  attributes:
+    - name: dataColumnSysId
+      description: 数据id
+      type:
+        primitive: int64
+    - name: resource
+      description: 资源 （列如表单 user）
+      type:
+        primitive: string
+    - name: columns
+      description: 数据列字段代码名称
+      type:
+        array: dataColumn

+version: v1
+kind: Schema
+metadata:
+  name: dictionary
+  description: 字典
+  attributes:
+    - name: dictionaryId
+      description: 字典编号 主键
+      type:
+        primitive: int
+    - name: dictCode
+      description: 字典编码
+      type:
+        primitive: string
+    - name: dictName
+      description: 字典名称
+      type:
+        primitive: string
+    - name: enableStatus
+      description: 启用状态(启用:1 禁用:2)
+      type:
+        primitive: int
+    - name: desc
+      description: 备注信息
+      type:
+        primitive: string
+    - name: dictItems
+      description: 字典值列表
+      type:
+        array: dictionaryItem

+version: v1
+kind: Schema
+metadata:
+  name: dictionaryItem
+  description: 字典明细项
+  attributes:
+    - name: itemCode
+      description: 项编码
+      type:
+        primitive: string
+    - name: itemLabel
+      description: 项标签
+      type:
+        primitive: string
+    - name: itemValue
+      description: 值
+      type:
+        primitive: string
+    - name: enableStatus
+      description: 启用状态(启用:1 禁用:2)
+      type:
+        primitive: string
+    - name: sort
+      description: 显示序号
+      type:
+        primitive: int

@@ -16,26 +16,14 @@ metadata:
       description: 菜单名称
       description: 菜单名称
       type:
       type:
         primitive: string
         primitive: string
-    - name: module
-      description: 模块 （首页 INDEX、业务BISINESS、管理MANAGER、报表REPORT）
-      type:
-        primitive: string
     - name: code
     - name: code
-      description: 菜单编码
+      description: 菜单编码 SYSTEM_USER_EDIT (权限编码)
       type:
       type:
         primitive: string
         primitive: string
     - name: menuType
     - name: menuType
-      description: 菜单类型 （模块module、子模块submodule、菜单menu、按钮button）
+      description: 菜单类型 （目录catalog、菜单menu、按钮button）
       type:
       type:
         primitive: string
         primitive: string
-    - name: status
-      description: 菜单状态 bit0:启用(1)/禁用(0)  bit1:启用收藏(1)/禁用收藏(0)(默认禁用)
-      type:
-        primitive: int
-    - name: access
-      description: 关联权限
-      type:
-        schema: access
     - name: icon
     - name: icon
       description: 菜单图标
       description: 菜单图标
       type:
       type:
@@ -48,8 +36,8 @@ metadata:
       description: 菜单说明
       description: 菜单说明
       type:
       type:
         primitive: string
         primitive: string
-    - name: tag
-      description: 菜单标签 （web、app）
+    - name: category
+      description: 菜单类别 （web:1、app:2）
       type:
       type:
         primitive: string
         primitive: string
     - name: parentPath
     - name: parentPath
@@ -57,6 +45,10 @@ metadata:
       type:
       type:
         primitive: string
         primitive: string
     - name: isPublish
     - name: isPublish
-      description: 是否是公开的菜单，[0:否],[1:是],默认否
+      description: 菜单是否公开状态，[0:隐藏],[1:显示],默认显示
+      type:
+        primitive: int
+    - name: isSystem
+      description: 菜单是否是系统级，[0:否],[1:是],默认否
       type:
       type:
         primitive: int
         primitive: int

@@ -14,9 +14,9 @@ metadata:
       required: true
       required: true
     - ref: deleteAt
     - ref: deleteAt
       required: true
       required: true
-    - ref: organizationCode
+    - ref: orgCode
       required: true
       required: true
-    - ref: organizationName
+    - ref: orgName
       required: true
       required: true
     - name: isOrg
     - name: isOrg
       description: 是否是组织
       description: 是否是组织

-version: v1
-kind: Schema
-metadata:
-  name: organizationRole
-  description: 组织权限
-  attributes:
-  - ref: organizationId
-    required: true
-  - name: roles
-    description: 角色列表
-    type: 
-      array: int64

@@ -4,19 +4,25 @@ metadata:
   name: role
   name: role
   description: 角色 （base)
   description: 角色 （base)
   attributes:
   attributes:
-  - ref: roleId
-    required: true
-  - ref: companyId
-    required: true
-  - ref: organizationId
-    required: true
-  - ref: roleName
-    required: true
-  - name: menuAccess
-    description: 菜单权限列表
-    type: 
-      array: int64
-  - name: description
-    description: 描述
-    type: 
-      primitive: string
+    - ref: roleId
+      required: true
+    - ref: companyId
+      required: true
+    - name: organization
+      description: 组织信息
+      type:
+        schema: organization
+    - ref: roleName
+      required: true
+    - name: menuAccess
+      description: 菜单权限列表
+      type:
+        array: int64
+    - name: desc
+      description: 角色描述
+      type:
+        primitive: string
+    - ref: createAt
+      required: true
+    - ref: updateAt
+      required: true

@@ -18,7 +18,7 @@ metadata:
       description: 手机认证
       description: 手机认证
       type:
       type:
         schemal: phoneAuth
         schemal: phoneAuth
-    - name: credentialAuths
-      description: 凭证认证
-      type:
-        array: credentialAuth
+    - ref: createAt
+      required: true
+    - ref: updateAt
+      required: true

@@ -19,23 +19,27 @@ metadata:
     - name: organization
     - name: organization
       description: 组织机构
       description: 组织机构
       type:
       type:
-        primitive: int64
+        schema: organization
     - name: department
     - name: department
       description: 所属部门
       description: 所属部门
       type:
       type:
-        primitive: int64
-    - name: organizationRoles
-      description: 组织权限列表
+        schema: organization
+    - name: usersOrg
+      description: 用户关联的组织
       type:
       type:
-        array: organizationRole
+        array: int64
+    - name: usersRole
+      description: 用户关联的角色
+      type:
+        array: int64
     - name: collectedMenus
     - name: collectedMenus
       description: 收藏的菜单(工作台)
       description: 收藏的菜单(工作台)
       type:
       type:
-        array: access
+        array: menu
     - name: cooperationInfo
     - name: cooperationInfo
       description: 共创信息 （共创用户有效）
       description: 共创信息 （共创用户有效）
       type:
       type:
-        primitive: cooperationInfo
+        schema: cooperationInfo
     - name: enableStatus
     - name: enableStatus
       description: 启用状态(启用:1 禁用:2)
       description: 启用状态(启用:1 禁用:2)
       type:
       type:
@@ -48,5 +52,3 @@ metadata:
       required: true
       required: true
     - ref: updateAt
     - ref: updateAt
       required: true
       required: true
-    - ref: deleteAt
-      required: true

@@ -2,17 +2,17 @@ version: v1
 kind: Schema
 kind: Schema
 metadata:
 metadata:
   name: usersInfo
   name: usersInfo
-  description: 用户信息
+  description: 用户信息 (base)
   attributes:
   attributes:
-  - ref: usersName
-    required: true
-  - ref: usersCode
-    required: true
-  - name: phone
-    description: 手机号码
-    type: 
-      primitive: string
-  - name: email
-    description: 邮箱
-    type: 
-      primitive: string
+    - ref: usersName
+      required: true
+    - ref: usersCode
+      required: true
+    - name: phone
+      description: 手机号码
+      type:
+        primitive: string
+    - name: email
+      description: 邮箱
+      type:
+        primitive: string