From fcfd2fb576f29e096aa658dbcf2e4f4219eaeaf7 Mon Sep 17 00:00:00 2001
From: ValdiANS <rvdans002@gmail.com>
Date: Tue, 23 Dec 2025 15:55:50 +0700
Subject: [PATCH] Merge branch 'feat/FE/US-304/permission-guard' into
 feat/FE/US-304/permission-guard-master-data