Merge remote-tracking branch 'origin/dev' into dev

lizijie

2021-05-25 aecc6316d0a6bcb3119dc062106deb5a57cdd790

 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: 角色