Merge branch 'main' into branch-1

2025-03-31 19:53:28 +05:30
parent 616851b837 5981abb5c2
commit 9477f79a37
77 changed files with 3682 additions and 257 deletions
--- a/src/socket-server/services/users/user-controller.ts
+++ b/src/socket-server/services/users/user-controller.ts
@@ -1,5 +1,5 @@
-import cameraModel from "../../../shared/model/camera/camera-Model"
-import userModel from "../../../shared/model/user-Model"
+import cameraModel from "../../../shared/model/camera/camera-Model.ts"
+import userModel from "../../../shared/model/user-Model.ts"

 export const activeUsers = async (data: any) => {
    const {organization}=data