mirror of
https://gitee.com/dromara/RuoYi-Cloud-Plus.git
synced 2026-04-24 19:38:35 +08:00
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
Conflicts: pom.xml ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml ruoyi-ui/src/views/system/user/index.vue sql/ry_config_20220510.sql
This commit is contained in:
@@ -11,7 +11,7 @@ import DictOptions from './DictOptions'
|
||||
export default class DictMeta {
|
||||
constructor(options) {
|
||||
this.type = options.type
|
||||
this.request = options.request,
|
||||
this.request = options.request
|
||||
this.responseConverter = options.responseConverter
|
||||
this.labelField = options.labelField
|
||||
this.valueField = options.valueField
|
||||
|
||||
Reference in New Issue
Block a user