diff --git a/src/views/Yanxue/achievementsOne.vue b/src/views/Yanxue/achievementsOne.vue index ea6919b..d44a9dc 100644 --- a/src/views/Yanxue/achievementsOne.vue +++ b/src/views/Yanxue/achievementsOne.vue @@ -17,13 +17,27 @@ --> +<<<<<<< Updated upstream
+======= +
+
+>>>>>>> Stashed changes
{{ v.titleName }}
置顶
发布于2022.7.4
+<<<<<<< Updated upstream
浏览量 {{v.liul}}
+======= +
浏览量 {{ v.liul }}
+>>>>>>> Stashed changes
@@ -42,12 +56,47 @@