Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-06-02 a52b9c0e0f708b36d35dbc95c591645d249d7db7

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