From 6f12948893fcc846dfb32aa861c473a842edcd56 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 23 Jun 2021 14:46:15 +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