Merge branch 'develop' into dev-tee

# Conflicts:
#	src/api/index.ts
#	src/modules/05_placement/router.ts
This commit is contained in:
setthawutttty 2023-08-15 14:01:59 +07:00
commit 314d7113bf
22 changed files with 1341 additions and 1472 deletions

View file

@ -26,7 +26,8 @@ const config = ref<any>({
"https://s3cluster.frappet.com/bma-ehr-fpt/organization/strueture/tree_20230712_172702.json",
MEET_URI: "meet.frappet.com",
API_RETIREMENT_URI: "https://bma-ehr.frappet.synology.me/api/v1",
API_PROBATION_URI: "https://ehr.joolsoft.com/v1",
// API_PROBATION_URI: "https://ehr.joolsoft.com/v1",
API_PROBATION_URI: "https://bmaehr.joolsoft.com/nodeapi/v1",
// API_PROBATION_URI: "http://192.168.1.151:7776/v1",
},
test: {