diff --git a/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md b/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md index dd9a0f04c7616fc9722fc857dc6ed6d499b2c201..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md +++ b/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md @@ -1,12 +0,0 @@ -### 相关的Issue - - -### 原因(目的、解决的问题等) - - -### 描述(做了什么,变更了什么) - - -### 测试用例(新增、改动、可能影响的功能) - - diff --git a/services/abilitymgr_lite/include/util/abilityms_log.h b/services/abilitymgr_lite/include/util/abilityms_log.h index d16a59056a9621329427c4f8f84cd3fb13849583..159f2982fb76de18334ea74d7e8eaf9053bb6137 100755 --- a/services/abilitymgr_lite/include/util/abilityms_log.h +++ b/services/abilitymgr_lite/include/util/abilityms_log.h @@ -16,9 +16,7 @@ #ifndef OHOS_LOGGING_H #define OHOS_LOGGING_H -#ifndef APP_PLATFORM_WATCHGT #include "log.h" -#endif namespace OHOS { #undef LOG_TAG