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

gdg

2020-12-18 20e1449578ac0e558dc038e302001d3a6819ab2c

 src/main/java/com/nanometer/smartlab/controller/LoginController.java

@@ -53,6 +53,8 @@
            String PW_PATTERN = "(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[~!@#$%^&*_.]).{8,}";
            if (!loginPwd.matches(PW_PATTERN)) {
                ischange = 1;
            }else {
                ischange = 0;
            }

            this.menuController.initPage();