Merge branch 'develop' into nice_dev
# Conflicts: # src/api/11_discipline/api.discipline.ts
This commit is contained in:
parent
42c0eb669f
commit
2021296898
1 changed files with 3 additions and 2 deletions
|
|
@ -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}`,
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue