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

# Conflicts:
#	src/views/tool/gen/index.vue

src/views/system/role/index.vue

@@ -360,7 +360,7 @@ const reset = () => {
     menuNodeAll.value = false
     deptExpand.value = true
     deptNodeAll.value = false
-    form.value = initForm
+    form.value = { ...initForm };
     roleFormRef.value.resetFields();
 
 }