Merge branch 'master' of codeup.aliyun.com:64191456b9581d62e8f81ac0/ASR1603_G5
authord15521469561 <d155214695615@qq.com>
Thu, 6 Apr 2023 09:16:11 +0000 (17:16 +0800)
committerd15521469561 <d155214695615@qq.com>
Thu, 6 Apr 2023 09:16:11 +0000 (17:16 +0800)
commitbf48efcc244c5cea2b2f901c22355627b5a923f2
treeae219a46a9e98408c62f89a8b2f059b772498c89
parent97f6bacf84236d53dbf5b2b53d6be6dce54095b5
parent401992fe664af767be373958f163f855b0d06929
Merge branch 'master' of codeup.aliyun.com:64191456b9581d62e8f81ac0/ASR1603_G5

# Conflicts:
# 3.code/1.watch/2.code/mgr.py
3.code/1.watch/2.code/main_1.py
3.code/1.watch/2.code/mgr.py
3.code/1.watch/2.code/ui.py