Browse Source

合冲突合漏了

cxmo 1 năm trước cách đây
mục cha
commit
fd29c048e5

+ 0 - 2
src/views/report_manage/reportlist.vue

@@ -217,8 +217,6 @@
               </svg>
               </svg>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
-          <el-table-column
-          ></el-table-column>
           <el-table-column v-if="permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_reportList_sendTime)"
           <el-table-column v-if="permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_reportList_sendTime)"
             prop="MsgSendTime"
             prop="MsgSendTime"
             label="报告推送时间"
             label="报告推送时间"