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

src/views/admin/system/user/form.vue

@@ -149,7 +149,7 @@ const dataRules = ref({
 	// 用户名校验，不能为空 、长度 5-20、不能和已有数据重复
 	username: [
 		{ required: true, message: "用户名不能为空", trigger: "blur" },
-		{ min: 5, max: 20, message: "用户名称长度必须介于 5 和 20 之间", trigger: "blur" },
+		{ min: 5, max: 60, message: "用户名称长度必须介于 5 和 20 之间", trigger: "blur" },
 		{
 			validator: (rule: any, value: any, callback: any) => {
 				validateUsername(rule, value, callback, dataForm.userId !== "")