projects
/
mirrors
/
FD230.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2ad4d52
148a8ed
)
Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...
author
luozheng
<1732036298@qq.com>
Fri, 22 Mar 2024 11:15:45 +0000
(19:15 +0800)
committer
luozheng
<1732036298@qq.com>
Fri, 22 Mar 2024 11:15:45 +0000
(19:15 +0800)
1
2
code/sdk/application/wearable/service/msg_center/CMakeLists.txt
patch
|
diff1
|
diff2
|
blob
|
history
code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
code/sdk/application/wearable/service/msg_center/CMakeLists.txt
Simple merge
diff --cc
code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
index
c130e5e
,
e1cb869
..
bd758a7
---
1
/
code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
---
2
/
code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
+++ b/
code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
@@@
-36,7
-36,7
+36,8
@@@
#include "testchanging.h"
#include "testcat1.h"
#include "testhrsenson.h"
+ #include "ConfigModel.h"
+#include "power_display_service.h"
namespace OHOS {
#ifdef __cplusplus