合并冲突

This commit is contained in:
wyx
2023-01-09 16:13:45 +08:00
9 changed files with 98 additions and 35 deletions

View File

@@ -371,7 +371,7 @@ export default {
: text.record.finishStatus == 1
? "已完成"
: text.record.finishStatus == 2
? "未完成"
? "进行中"
: "-"}
</span>
</div>