Merge remote-tracking branch 'origin/master'

src/views/canteen/canteenCategory/index.vue

@@ -65,6 +65,7 @@
 						<preview-image :src="scope.row.picUrl" />
 					</template>
 				</el-table-column>
+				<el-table-column prop="sort" label="排序" show-overflow-tooltip min-width="100" />
 				<el-table-column prop="createBy" label="创建者" show-overflow-tooltip min-width="100" />
 				<el-table-column prop="updateBy" label="更新者" show-overflow-tooltip min-width="100" />
 				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip min-width="160" />