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

src/views/system/myInternalMessage/index.vue

@@ -3,9 +3,9 @@
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="来源" prop="fromId">
+<!--      <el-form-item label="来源" prop="fromId">
         <el-input v-model="queryParams.fromId" placeholder="请输入站内信来源" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="发送时间">
         <el-date-picker v-model="dateRangeSendTime" style="width: 240px" value-format="yyyy-MM-dd"
                         type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
@@ -39,7 +39,7 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
       <el-table-column label="" align="center" prop="id" />
-      <el-table-column label="来源" align="center" prop="fromId" />
+<!--      <el-table-column label="来源" align="center" prop="fromId" />-->
       <el-table-column label="发送时间" align="center" prop="sendTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.sendTime) }}</span>