Merge branch 'dev' of https://bdgit.educoder.net/p2whvruqn/gitProject1
# Conflicts:
# doc/03_张锦辉_维护需求与设计方案.docx
# src/Notes-master/.gradle/7.5/executionHistory/executionHistory.bin
# src/Notes-master/.gradle/7.5/executionHistory/executionHistory.lock
# src/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin
# src/Notes-master/.gradle/7.5/fileHashes/fileHashes.lock
# src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock
# src/Notes-master/.gradle/file-system.probe
# src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
# src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
|
