Merge branch 'develop' into nice_dev

# Conflicts: # src/modules/11_discipline/router.ts
2023-10-17 17:49:31 +07:00 · 2023-10-17 17:49:31 +07:00 · 5b210fca60
commit 5b210fca60
parent cc7d32bf3d b9584e006b
26 changed files with 4121 additions and 648 deletions
--- a/src/interface/request/main/main.ts
+++ b/src/interface/request/main/main.ts
@ -431,7 +431,7 @@ const menuList = readonly<any[]>([
      {
        key: 11.4,
        label: "ออกคำสั่ง",
-        path: "/discipline-order",
+        path: "/disciplineorder",
        role: "coin",
      },
      {