Merge branch 'develop' into nice_dev

# Conflicts:
#	src/modules/11_discipline/router.ts

src/modules/11_discipline/components/4_Order/Step02.vue

@@ -0,0 +1,38 @@
+<script setup lang="ts">
+const props = defineProps({
+  next: {
+    type: Function,
+    default: () => console.log("not function"),
+  },
+  previous: {
+    type: Function,
+    default: () => console.log("not function"),
+  },
+});
+const next = () => props.next();
+const previous = () => props.previous();
+</script>
+
+<template>
+  <div><h1>step02</h1></div>
+  <q-card-actions align="right">
+    <q-btn
+      dense
+      unelevated
+      label="back"
+      color="public"
+      @click="previous()"
+      class="q-px-md"
+    />
+    <q-btn
+      dense
+      unelevated
+      label="next"
+      color="public"
+      @click="next()"
+      class="q-px-md"
+    />
+  </q-card-actions>
+</template>
+
+<style scoped></style>