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

gdg

2021-02-01 8beaf701a900ddd5a0a482f425080635ff55166d

 src/main/webapp/user_mng.xhtml

@@ -193,8 +193,7 @@

                <p:outputLabel value="密码" ></p:outputLabel>
                <p:password value="#{userMngController.sysUser.password}" maxlength="100"
                             requiredMessage="请输入密码"
                            ></p:password>
                             requiredMessage="请输入密码" autocomplete="off"></p:password>

                <p:outputLabel value="电话"></p:outputLabel>
                <p:inputText value="#{userMngController.sysUser.phone}" maxlength="30"></p:inputText>