From 20212968982de7a9789b49cfa30a662e7cd61e2f Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 29 Nov 2023 13:58:23 +0700
Subject: [PATCH] Merge branch 'develop' into nice_dev

# Conflicts:
#	src/api/11_discipline/api.discipline.ts
---
 src/api/11_discipline/api.discipline.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/api/11_discipline/api.discipline.ts b/src/api/11_discipline/api.discipline.ts
index e50d9cf61..a69c27f4b 100644
--- a/src/api/11_discipline/api.discipline.ts
+++ b/src/api/11_discipline/api.discipline.ts
@@ -1,6 +1,7 @@
 import env from "../index";
 const discipline = `${env.API_URI}/discipline/disciplinary`;
 const investigate = `${env.API_URI}/discipline/investigate`;
+const discipline2 = `${env.API_URI}/discipline`;
 
 export default {
   directorList: (page: number, pageSize: number, keyword: string) =>
@@ -60,6 +61,6 @@ export default {
   disciplinaryApprove: (id: string) => `${discipline}/approve/${id}`,
 
   /** รายการผลการพิจารณาทางวินัย*/
-  listResult: () => `${discipline}/result`,
-  listResultById: (id: string) => `${discipline}/result/${id}`,
+  listResult: () => `${discipline2}/result`,
+  listResultById: (id: string) => `${discipline2}/result/${id}`,
 };