From f342a0d88b2a7168f794d0cf545d16a3138acb6d Mon Sep 17 00:00:00 2001
From: wuqiping <wuqiping@qq.com>
Date: Wed, 09 Jun 2021 15:55:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/resources/application-moduleFormColumn.yml | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/screen-manage/src/main/resources/application-moduleFormColumn.yml b/screen-manage/src/main/resources/application-moduleFormColumn.yml
index 27e2860..1faddd1 100644
--- a/screen-manage/src/main/resources/application-moduleFormColumn.yml
+++ b/screen-manage/src/main/resources/application-moduleFormColumn.yml
@@ -12,6 +12,13 @@
email: ������
wechat: ������
expireTime: ������������
+ manage-account-form-map:
+ userName: ������
+ password: ������
+ email: ������
+ mobile: ���������
+ wechat: ������
+ roleIds: ������
--
Gitblit v1.8.0