Merge branch 'master' of codeup.aliyun.com:64191456b9581d62e8f81ac0/ASR1603_G5
authord15521469561 <d155214695615@qq.com>
Mon, 17 Apr 2023 12:31:18 +0000 (20:31 +0800)
committerd15521469561 <d155214695615@qq.com>
Mon, 17 Apr 2023 12:31:18 +0000 (20:31 +0800)
commitfdd9f896aee224941f9972b45ba85a2659af844f
tree3e3223b0d79b73b0142cab1081c412c1a3d50501
parent6105a5f3a650c0792a5fc9026105019fd316a592
parente8d2ce41a33e1b77a7516d02aed1a66bff5e331a
Merge branch 'master' of codeup.aliyun.com:64191456b9581d62e8f81ac0/ASR1603_G5

# Conflicts:
# 3.code/1.watch/2.code/ui_WatchFaceScreen.py
# 3.code/1.watch/2.code/ui_main_menu.py