Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep into master

# Conflicts:
#	src/components/CommodityMan/goodsList.vue

src/components/CommodityMan/goodsList.vue

@@ -381,9 +381,20 @@
               @click="goGoodsEdit(scope.row.Id)"
               style="width: 32px; height: 32px; margin: 0 10px"
               v-if="
-                currentUserInfo.EmpId == 0 ||
+                currentUserInfo.TenantId == 1 &&
+                currentUserInfo.MallBaseId == 1 &&
+                (currentUserInfo.EmpId == 0 ||
                   currentUserInfo.IsOtherUpdateGoods == 1 ||
-                currentUserInfo.EmpId == scope.row.CreateBy
+                  currentUserInfo.EmpId == scope.row.CreateBy)
+              "
+              src="../../assets/img/userman/edit.png"
+              alt=""
+            />
+            <img
+              @click="goGoodsEdit(scope.row.Id)"
+              style="width: 32px; height: 32px; margin: 0 10px"
+              v-if="
+                currentUserInfo.TenantId != 1 && currentUserInfo.MallBaseId != 1
               "
               src="../../assets/img/userman/edit.png"
               alt=""