From fa215acbed2974de77844a0749a68d27076e920b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 16 Jan 2021 13:53:47 +0800
Subject: [PATCH] Merge branch 'api' of https://gitee.com/jyyforjava/zq-erp into api

---
 zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java b/zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java
index f1b1260..18b77fa 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/actions/AdminAction.java
@@ -139,9 +139,7 @@
         SysUsers loginUser = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
         loginUser.setCreateBy(loginUser.getSuName());
         sysUsers.setCompanyId(loginUser.getCompanyId());
-        sysUsers.setShopId(loginUser.getShopId());
         int i = sysUsersService.addAdmin(sysUsers);
-
         if (i > 0) {
             return new AjaxResult(AjaxResult.STATUS_SUCCESS, SystemMessageCode.ADD_SUCCES, AppVocabularyCode.ADMIN);
         } else {

--
Gitblit v1.9.1