diff --git a/dm/src/display_manager.cpp b/dm/src/display_manager.cpp
index 57b8ac1b0ae7cf96ab69773682d26f71227cd42c..8c6c34fee2b0b0957e7856861698e663be020ace 100644
--- a/dm/src/display_manager.cpp
+++ b/dm/src/display_manager.cpp
@@ -14,6 +14,9 @@
  */
 
 #include "display_manager.h"
+
+#include <inttypes.h>
+
 #include "display_manager_adapter.h"
 #include "window_manager_hilog.h"
 
@@ -89,7 +92,7 @@ std::vector<const sptr<Display>> DisplayManager::GetAllDisplays()
         if (display != nullptr) {
             res.push_back(display);
         } else {
-            WLOGFE("DisplayManager::GetAllDisplays display %llu nullptr!", displayId);
+            WLOGFE("DisplayManager::GetAllDisplays display %" PRIu64" nullptr!", displayId);
         }
     }
     return res;
diff --git a/dmserver/src/display_manager_proxy.cpp b/dmserver/src/display_manager_proxy.cpp
index 87c482a3e6d6876c5786b7c5b776f353734614c9..a286f6fae44ff740aeed888e34e4cdc4e72d1e78 100644
--- a/dmserver/src/display_manager_proxy.cpp
+++ b/dmserver/src/display_manager_proxy.cpp
@@ -15,6 +15,7 @@
 
 #include "display_manager_proxy.h"
 
+#include <inttypes.h>
 #include <ipc_types.h>
 
 #include "window_manager_hilog.h"
@@ -69,7 +70,7 @@ DisplayId DisplayManagerProxy::GetDefaultDisplayId()
     }
 
     DisplayId displayId = reply.ReadUint64();
-    WLOGFI("DisplayManagerProxy::GetDefaultDisplayId %llu", displayId);
+    WLOGFI("DisplayManagerProxy::GetDefaultDisplayId %" PRIu64"", displayId);
     return displayId;
 }
 
diff --git a/dmserver/src/display_manager_service_inner.cpp b/dmserver/src/display_manager_service_inner.cpp
index 61a9c3f6f868f3df191f14847fdbde83284be279..9b53ac1cfb0768c6cbaee5f18465a7bbcf374d62 100644
--- a/dmserver/src/display_manager_service_inner.cpp
+++ b/dmserver/src/display_manager_service_inner.cpp
@@ -16,6 +16,7 @@
 #include "display_manager_service_inner.h"
 
 #include <cinttypes>
+#include <inttypes.h>
 #include <unistd.h>
 
 #include <ipc_skeleton.h>
@@ -81,7 +82,7 @@ std::vector<const sptr<DisplayScreen>> DisplayManagerServiceInner::GetAllDisplay
         if (display != nullptr) {
             res.push_back(display);
         } else {
-            WLOGFE("GetAllDisplays display %llu nullptr!", displayId);
+            WLOGFE("GetAllDisplays display %" PRIu64" nullptr!", displayId);
         }
     }
     return res;
diff --git a/interfaces/kits/napi/display/native_display_module.cpp b/interfaces/kits/napi/display/native_display_module.cpp
index 613ffaa0de1ba0d5d4bbb117a43c5fdfffc02904..127326b9e449026db4778019da438286c416ed09 100644
--- a/interfaces/kits/napi/display/native_display_module.cpp
+++ b/interfaces/kits/napi/display/native_display_module.cpp
@@ -13,8 +13,11 @@
  * limitations under the License.
  */
 
-#include "display_manager.h"
 #include "native_display_module.h"
+
+#include <inttypes.h>
+
+#include "display_manager.h"
 #include "wm_common.h"
 #include "wm_napi_common.h"
 
@@ -40,7 +43,7 @@ void Async(napi_env env, std::unique_ptr<Param> &param)
         param->wret = WMError::WM_ERROR_NULLPTR;
         return;
     }
-    GNAPI_LOG("GetDefaultDisplay: id %llu, w %d, h %d",
+    GNAPI_LOG("GetDefaultDisplay: id %" PRIu64", w %d, h %d",
         param->display->GetId(), param->display->GetWidth(), param->display->GetHeight());
     param->wret = WMError::WM_OK;
 }
diff --git a/sa_profile/4606.xml b/sa_profile/4606.xml
index 7a02c334da51c72dd7275991b7f5fe9b667c4f74..aa7248817946bb7fa7eec11c21d3fb778428488a 100644
--- a/sa_profile/4606.xml
+++ b/sa_profile/4606.xml
@@ -23,4 +23,4 @@
         <distributed>false</distributed> <!-- "true" means the system ability supports distributed scheduling while "false" is not.-->
         <dump-level>1</dump-level> <!-- Declare the dump level. 1-high; 2-media; 3-low -->
     </systemability>
-</info>
+</info>
\ No newline at end of file
diff --git a/sa_profile/4605.xml b/sa_profile/4607.xml
similarity index 96%
rename from sa_profile/4605.xml
rename to sa_profile/4607.xml
index 9197521b84da4a3c388437fdcd08737748f304df..79bb9b4df0b16c9973d9649620d0914d823af433 100644
--- a/sa_profile/4605.xml
+++ b/sa_profile/4607.xml
@@ -15,7 +15,7 @@
 <info>
     <process>foundation</process>
     <systemability> <!--Declare a system ability and its profile-->
-        <name>4605</name> <!--Declare the name of system ability-->
+        <name>4607</name> <!--Declare the name of system ability-->
         <libpath>libwms.z.so</libpath> <!--Declare the path of .so file which includes the system ability; Note: 1 .so file have 1 to N sysytem abilities. -->
         <!--<depend></depend>--> <!--Declare the name of system abilities which the system ability depends on,using the system ability would start on demand. -->
         <!--<depend-time-out></depend-time-out> --> <!-- Check all dependencies are available before the timeout period ended. The MAX_DEPENDENCY_TIMEOUT is 60s. -->
diff --git a/sa_profile/BUILD.gn b/sa_profile/BUILD.gn
index f3a586d78108d54cf5737e224b183325af25b5f7..616acf799ec507286577a67f3bbeb4e0068b6507 100644
--- a/sa_profile/BUILD.gn
+++ b/sa_profile/BUILD.gn
@@ -15,8 +15,8 @@ import("//build/ohos/sa_profile/sa_profile.gni")
 
 ohos_sa_profile("wms_sa_profile") {
   sources = [
-    "4605.xml",
     "4606.xml",
+    "4607.xml",
   ]
   part_name = "window_manager"
 }
diff --git a/wmtest/dm/src/display_manager.cpp b/wmtest/dm/src/display_manager.cpp
index 57b8ac1b0ae7cf96ab69773682d26f71227cd42c..8c6c34fee2b0b0957e7856861698e663be020ace 100644
--- a/wmtest/dm/src/display_manager.cpp
+++ b/wmtest/dm/src/display_manager.cpp
@@ -14,6 +14,9 @@
  */
 
 #include "display_manager.h"
+
+#include <inttypes.h>
+
 #include "display_manager_adapter.h"
 #include "window_manager_hilog.h"
 
@@ -89,7 +92,7 @@ std::vector<const sptr<Display>> DisplayManager::GetAllDisplays()
         if (display != nullptr) {
             res.push_back(display);
         } else {
-            WLOGFE("DisplayManager::GetAllDisplays display %llu nullptr!", displayId);
+            WLOGFE("DisplayManager::GetAllDisplays display %" PRIu64" nullptr!", displayId);
         }
     }
     return res;
diff --git a/wmtest/dmserver/src/display_manager_proxy.cpp b/wmtest/dmserver/src/display_manager_proxy.cpp
index 87c482a3e6d6876c5786b7c5b776f353734614c9..a286f6fae44ff740aeed888e34e4cdc4e72d1e78 100644
--- a/wmtest/dmserver/src/display_manager_proxy.cpp
+++ b/wmtest/dmserver/src/display_manager_proxy.cpp
@@ -15,6 +15,7 @@
 
 #include "display_manager_proxy.h"
 
+#include <inttypes.h>
 #include <ipc_types.h>
 
 #include "window_manager_hilog.h"
@@ -69,7 +70,7 @@ DisplayId DisplayManagerProxy::GetDefaultDisplayId()
     }
 
     DisplayId displayId = reply.ReadUint64();
-    WLOGFI("DisplayManagerProxy::GetDefaultDisplayId %llu", displayId);
+    WLOGFI("DisplayManagerProxy::GetDefaultDisplayId %" PRIu64"", displayId);
     return displayId;
 }
 
diff --git a/wmtest/dmserver/src/display_manager_service_inner.cpp b/wmtest/dmserver/src/display_manager_service_inner.cpp
index 61a9c3f6f868f3df191f14847fdbde83284be279..9b53ac1cfb0768c6cbaee5f18465a7bbcf374d62 100644
--- a/wmtest/dmserver/src/display_manager_service_inner.cpp
+++ b/wmtest/dmserver/src/display_manager_service_inner.cpp
@@ -16,6 +16,7 @@
 #include "display_manager_service_inner.h"
 
 #include <cinttypes>
+#include <inttypes.h>
 #include <unistd.h>
 
 #include <ipc_skeleton.h>
@@ -81,7 +82,7 @@ std::vector<const sptr<DisplayScreen>> DisplayManagerServiceInner::GetAllDisplay
         if (display != nullptr) {
             res.push_back(display);
         } else {
-            WLOGFE("GetAllDisplays display %llu nullptr!", displayId);
+            WLOGFE("GetAllDisplays display %" PRIu64" nullptr!", displayId);
         }
     }
     return res;
diff --git a/wmtest/interfaces/kits/napi/display/native_display_module.cpp b/wmtest/interfaces/kits/napi/display/native_display_module.cpp
index 613ffaa0de1ba0d5d4bbb117a43c5fdfffc02904..127326b9e449026db4778019da438286c416ed09 100644
--- a/wmtest/interfaces/kits/napi/display/native_display_module.cpp
+++ b/wmtest/interfaces/kits/napi/display/native_display_module.cpp
@@ -13,8 +13,11 @@
  * limitations under the License.
  */
 
-#include "display_manager.h"
 #include "native_display_module.h"
+
+#include <inttypes.h>
+
+#include "display_manager.h"
 #include "wm_common.h"
 #include "wm_napi_common.h"
 
@@ -40,7 +43,7 @@ void Async(napi_env env, std::unique_ptr<Param> &param)
         param->wret = WMError::WM_ERROR_NULLPTR;
         return;
     }
-    GNAPI_LOG("GetDefaultDisplay: id %llu, w %d, h %d",
+    GNAPI_LOG("GetDefaultDisplay: id %" PRIu64", w %d, h %d",
         param->display->GetId(), param->display->GetWidth(), param->display->GetHeight());
     param->wret = WMError::WM_OK;
 }
diff --git a/wmtest/test/dm_native_test.cpp b/wmtest/test/dm_native_test.cpp
index 3373ab11eddf9328cb918d6b5b2866710bbc49d3..8bd616a8efba348091a6b772f103a399b0d82cd3 100644
--- a/wmtest/test/dm_native_test.cpp
+++ b/wmtest/test/dm_native_test.cpp
@@ -16,7 +16,9 @@
 #include "dm_native_test.h"
 
 #include <cstdio>
+#include <inttypes.h>
 #include <unistd.h>
+
 #include "wm_common.h"
 #include "display_manager.h"
 #include "singleton_container.h"
@@ -61,13 +63,13 @@ void DMNativeTest::Run(int32_t argc, const char **argv)
     }
 
     DisplayId displayId = dms->GetDefaultDisplayId();
-    printf("defaultDisplayId: %llu\n", displayId);
+    printf("defaultDisplayId: %" PRIu64"\n", displayId);
 
     auto display = dms->GetDefaultDisplay();
     if (display == nullptr) {
         printf("GetDefaultDisplay: failed!\n");
     } else {
-        printf("GetDefaultDisplay: id %llu, w %d, h %d, fps %u\n", display->GetId(), display->GetWidth(),
+        printf("GetDefaultDisplay: id %" PRIu64", w %d, h %d, fps %u\n", display->GetId(), display->GetWidth(),
             display->GetHeight(), display->GetFreshRate());
     }
 
@@ -75,9 +77,9 @@ void DMNativeTest::Run(int32_t argc, const char **argv)
     for (auto id: ids) {
         display = dms->GetDisplayById(displayId);
         if (display == nullptr) {
-            printf("GetDisplayById(%llu): failed!\n", id);
+            printf("GetDisplayById(%" PRIu64"): failed!\n", id);
         } else {
-            printf("GetDisplayById(%llu): id %llu, w %d, h %d, fps %u\n", id, display->GetId(), display->GetWidth(),
+            printf("GetDisplayById(%" PRIu64"): id %" PRIu64", w %d, h %d, fps %u\n", id, display->GetId(), display->GetWidth(),
                 display->GetHeight(), display->GetFreshRate());
         }
     }
@@ -87,7 +89,7 @@ void DMNativeTest::Run(int32_t argc, const char **argv)
         if (disp == nullptr) {
             printf("GetAllDisplays: failed!\n");
         } else {
-            printf("GetAllDisplays: id %llu, w %d, h %d, fps %u\n", disp->GetId(), disp->GetWidth(),
+            printf("GetAllDisplays: id %" PRIu64", w %d, h %d, fps %u\n", disp->GetId(), disp->GetWidth(),
                 disp->GetHeight(), disp->GetFreshRate());
         }
     }