Merge remote-tracking branch 'origin/develop' into develop

src/views/work/order/components/FeedbackRecord.vue

@@ -29,7 +29,7 @@
     <div v-if="type == 'support'">
       <el-empty v-if="!detail.feedbackSupportTime" :image-size="200" />
       <el-descriptions v-else border :column="1" :label-style="{ width: '130px' }">
-        <el-descriptions-item v-if="detail.orderTypeName != '销售申请培训工单'" label="反馈时间">
+        <el-descriptions-item label="反馈时间">
           {{ detail.feedbackSupportTime }}
         </el-descriptions-item>
         <el-descriptions-item v-if="detail.orderTypeName == '销售申请培训工单'" label="讲解时长">