Merge branch 'online1'

mec-web/src/main/resources/columnMapper.ini

@@ -16,8 +16,8 @@
 税务库存 = taxStockCount
 备查货号 = supplyChannel
 是否App展示 = clientShow
-是否教务端展示 = educationalShow
-是否乐团展示 = musicGroupShow
+是否在教务端展示 = educationalShow
+是否在乐团展示 = musicGroupShow
 库存类型 = stockType
 商品详情 = desc
 库存预警 = stockWarning