Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/modules/sys/userInfo/UserInfoForm.vue

src/views/modules/sys/userInfo/UserInfoForm.vue

@@ -2165,7 +2165,6 @@
       },
       showPhoto (url) {
         this.onPreview(url)
-        // return
       },
       // 身份证验证
       async validID (rule, value, callback) {