diff --git a/jero-boot/jero-cloud-module/jero-cloud-feign-config/src/main/resources/bootstrap.yml b/jero-boot/jero-cloud-module/jero-cloud-feign-config/src/main/resources/bootstrap.yml
index 5d1b0d67..f43a3974 100644
--- a/jero-boot/jero-cloud-module/jero-cloud-feign-config/src/main/resources/bootstrap.yml
+++ b/jero-boot/jero-cloud-module/jero-cloud-feign-config/src/main/resources/bootstrap.yml
@@ -23,8 +23,8 @@ spring:
prefix: @prefix.name@
# 支持多个共享 Data Id 的配置,优先级小于extension-configs,自定义 Data Id 配置 属性是个集合,内部由 Config POJO 组成。Config 有 3 个属性,分别是 dataId, group 以及 refresh
#shared-configs[0]:
- #data-id: ${prefix.name}-common.yaml # 配置文件名-Data Id
- #group: ${config.group} # 默认为DEFAULT_GROUP
+ #data-id: @prefix.name@-common.yaml # 配置文件名-Data Id
+ #group: @config.group@ # 默认为DEFAULT_GROUP
#refresh: false # 是否动态刷新,默认为false
discovery:
namespace: @config.namespace@
diff --git a/jero-web/src/views/system/modules/DeptRoleInfo.vue b/jero-web/src/views/system/modules/DeptRoleInfo.vue
index 3c982c38..ee357c82 100644
--- a/jero-web/src/views/system/modules/DeptRoleInfo.vue
+++ b/jero-web/src/views/system/modules/DeptRoleInfo.vue
@@ -70,7 +70,7 @@
-
+
@@ -165,18 +165,18 @@
return true;
},
handleEdit: function (record) {
- this.$refs.modalForm.title = "编辑";
- this.$refs.modalForm.departDisabled = true;
- this.$refs.modalForm.disableSubmit = false;
- this.$refs.modalForm.edit(record,record.departId);
+ this.$refs.sysDepartRoleModalForm.title = "编辑";
+ this.$refs.sysDepartRoleModalForm.departDisabled = true;
+ this.$refs.sysDepartRoleModalForm.disableSubmit = false;
+ this.$refs.sysDepartRoleModalForm.edit(record,record.departId);
},
handleAdd: function () {
if (this.currentDeptId == '') {
this.$message.error("请选择一个部门!")
} else {
- this.$refs.modalForm.departDisabled = true;
- this.$refs.modalForm.add(this.currentDeptId);
- this.$refs.modalForm.title = "新增";
+ this.$refs.sysDepartRoleModalForm.departDisabled = true;
+ this.$refs.sysDepartRoleModalForm.add(this.currentDeptId);
+ this.$refs.sysDepartRoleModalForm.title = "新增";
}
},
handlePerssion: function(record){