Merge branch 'five-second-add' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot_admin into six

src/views/Marketing/order/orderList/details/goodsManage.vue

@@ -476,8 +476,8 @@ export default {
         ];
         if (res.data.serviceTimeType === 4) {
           res.data.studyTimeArrays = [
-            this.$methodsTools.time10to13(res.data.serviceStartTime, 2),
-            this.$methodsTools.time10to13(res.data.serviceEndTime, 2),
+            this.$methodsTools.time10to13(res.data.studyStartTime, 2),
+            this.$methodsTools.time10to13(res.data.studyEndTime, 2),
           ];
         }
         res.data.standPriceJson = JSON.parse(res.data.standPriceJson);

src/views/education/studentManageMent/studentXQ/BankQuestionPassRecord.vue

@@ -577,8 +577,8 @@ export default {
         },
         {
           label: "学习有效期",
-          prop1: "studyStartTime",
-          prop2: "studyEndTime",
+          prop1: "serviceStartTime",
+          prop2: "serviceEndTime",
           scope: "moreTime",
           width: "300px",
         },