Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud

# Conflicts:
#	src/views/wallet/wallet-recharge-apply/preview-excel.vue

src/views/login/component/password.vue

@@ -105,8 +105,8 @@ const state = reactive({
 	isShowPassword: false, // 是否显示密码
 	ruleForm: {
 		// 表单数据
-		username: 'admin', // 用户名
-		password: '123456', // 密码
+		username: '', // 用户名
+		password: '', // 密码
 		code: '', // 验证码
 		randomStr: 'blockPuzzle', // 验证码随机数
 	},