kshitige d5a09c8caa Conflicts resolved

2025-03-27 18:57:36 +05:30

..

AlarmController.php

AlarmFetch

2025-03-26 17:14:34 +05:30

AssetadmintController.php

changes

2025-03-25 11:32:52 +05:30

CustomerController.php

changes in route method

2025-03-26 16:53:02 +05:30

DeviceController.php

changes in route method

2025-03-26 16:53:02 +05:30

DeviceProfileMasterController.php

changes

2025-03-25 11:32:52 +05:30

LoginController.php

device user list based on customer, login, create alarm

2025-03-26 11:37:58 +05:30

UsersController.php

changes in delete and users

2025-03-27 18:54:06 +05:30