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

maven

4 天以前 4b3024e8fa2ce27a2e0b408778d4e62cc570b8b4

 src/views/personnelManagement/onboarding/components/formDia.vue

@@ -137,7 +137,7 @@
import {ref} from "vue";
import {getStaffJoinInfo, staffJoinAdd, staffJoinUpdate} from "@/api/personnelManagement/onboarding.js";
const { proxy } = getCurrentInstance()
const emit = defineEmits(['confirm'])
const emit = defineEmits(['close'])

const dialogFormVisible = ref(false);
const operationType = ref('')