feat_surenjun #27

Merged
wangzhongjie merged 5 commits from feat_surenjun into main 2024-07-11 10:46:54 +08:00

5 Commits

Author SHA1 Message Date
3b79f0f4dd feat:济南问题修改 2024-07-10 19:39:13 +08:00
2d3813781c Merge branch 'main' into feat_surenjun
# Conflicts:
#	entry/src/main/ets/pages/compontents/SignDisplayCom.ets
#	entry/src/main/ets/pages/judgeSDK/utils/fileLog.ts
#	entry/src/main/ets/pages/judgeSDK/utils/fileModel.ts
#	entry/src/main/ets/pages/judgeSDK/utils/judgeCommon.ts
#	entry/src/main/ets/pages/judgeSDK/utils/judgeConfig.ts
#	entry/src/main/ets/pages/judgeSDK/utils/judgeReal.ts
#	entry/src/main/ets/pages/judgeSDK/utils/judgeTask.ts
#	entry/src/main/ets/pages/judgeSDK/utils/voiceAnnouncements.ts
2024-07-10 19:27:04 +08:00
4a72761601 feat:济南问题修改 2024-07-05 09:34:03 +08:00
83f6633957 Merge branch 'main' into feat_surenjun 2024-07-05 09:18:50 +08:00
Surenjun
1190d4da03 feat:科目三更新 2024-07-02 15:24:47 +08:00