Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into...

author root <root@hcj>

Sun, 3 Mar 2024 05:23:39 +0000 (13:23 +0800)

committer root <root@hcj>

Sun, 3 Mar 2024 05:23:39 +0000 (13:23 +0800)
author root <root@hcj>
Sun, 3 Mar 2024 05:23:39 +0000 (13:23 +0800)
committer root <root@hcj>
Sun, 3 Mar 2024 05:23:39 +0000 (13:23 +0800)
diff --cc code/sdk/application/wearable/fd230app/nativeui/dialupdate/src/DialUpdateModel.cpp
Simple merge
diff --cc code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
Simple merge
		1	2
code/sdk/application/wearable/fd230app/nativeui/dialupdate/src/DialUpdateModel.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp	patch \|	diff1 \|	diff2 \|	blob \| history