Merge branch 'iteration_0802' into test

src/views/resetTeaming/modals/subject-preview.vue

@@ -811,7 +811,8 @@ export default {
                 amount += 300
                 buyList.push({
                     name: '乐器保养',
-                    time: dayjs().format('YYYY/MM/DD') + '~' + dayjs().add(365, 'day').format('YYYY/MM/DD'),
+                    // time: dayjs().format('YYYY/MM/DD') + '~' + dayjs().add(365, 'day').format('YYYY/MM/DD'),
+                    time: "有效期：从发货之日起一年",
                     type: '包年',
                     price: 300
                 })