fix conflict

This commit is contained in:
vanilia
2025-11-25 14:10:01 +07:00
parent b188a55a8f
commit ca0fee997e
10 changed files with 26 additions and 19 deletions
@@ -2,13 +2,14 @@ package division
import (
"net/http"
u "simrs-vx/internal/use-case/simgos-sync-use-case/new/division"
rw "github.com/karincake/risoles"
// ua "github.com/karincake/tumpeng/auth/svc"
e "simrs-vx/internal/domain/main-entities/division"
esync "simrs-vx/internal/domain/sync-entities/log"
u "simrs-vx/internal/use-case/simgos-sync-use-case/new/division"
)
type myBase struct{}
@@ -2,13 +2,14 @@ package encounter
import (
"net/http"
u "simrs-vx/internal/use-case/simgos-sync-use-case/new/encounter"
rw "github.com/karincake/risoles"
// ua "github.com/karincake/tumpeng/auth/svc"
e "simrs-vx/internal/domain/main-entities/encounter"
esync "simrs-vx/internal/domain/sync-entities/log"
u "simrs-vx/internal/use-case/simgos-sync-use-case/new/encounter"
)
type myBase struct{}
@@ -2,13 +2,14 @@ package installation
import (
"net/http"
u "simrs-vx/internal/use-case/simgos-sync-use-case/new/installation"
rw "github.com/karincake/risoles"
// ua "github.com/karincake/tumpeng/auth/svc"
e "simrs-vx/internal/domain/main-entities/installation"
esync "simrs-vx/internal/domain/sync-entities/log"
u "simrs-vx/internal/use-case/simgos-sync-use-case/new/installation"
)
type myBase struct{}
@@ -2,13 +2,14 @@ package patient
import (
"net/http"
u "simrs-vx/internal/use-case/simgos-sync-use-case/new/patient"
rw "github.com/karincake/risoles"
// ua "github.com/karincake/tumpeng/auth/svc"
e "simrs-vx/internal/domain/main-entities/patient"
esync "simrs-vx/internal/domain/sync-entities/log"
u "simrs-vx/internal/use-case/simgos-sync-use-case/new/patient"
)
type myBase struct{}
@@ -2,13 +2,14 @@ package specialist
import (
"net/http"
u "simrs-vx/internal/use-case/simgos-sync-use-case/new/specialist"
rw "github.com/karincake/risoles"
// ua "github.com/karincake/tumpeng/auth/svc"
e "simrs-vx/internal/domain/main-entities/specialist"
esync "simrs-vx/internal/domain/sync-entities/log"
u "simrs-vx/internal/use-case/simgos-sync-use-case/new/specialist"
)
type myBase struct{}
@@ -2,13 +2,13 @@ package subspecialist
import (
"net/http"
u "simrs-vx/internal/use-case/simgos-sync-use-case/new/subspecialist"
rw "github.com/karincake/risoles"
// ua "github.com/karincake/tumpeng/auth/svc"
e "simrs-vx/internal/domain/main-entities/subspecialist"
esync "simrs-vx/internal/domain/sync-entities/log"
u "simrs-vx/internal/use-case/simgos-sync-use-case/new/subspecialist"
)
type myBase struct{}
@@ -2,13 +2,14 @@ package unit
import (
"net/http"
u "simrs-vx/internal/use-case/simgos-sync-use-case/new/unit"
rw "github.com/karincake/risoles"
// ua "github.com/karincake/tumpeng/auth/svc"
e "simrs-vx/internal/domain/main-entities/unit"
esync "simrs-vx/internal/domain/sync-entities/log"
u "simrs-vx/internal/use-case/simgos-sync-use-case/new/unit"
)
type myBase struct{}