From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict
---
zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java
index 3771598..2d14f86 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java
@@ -270,4 +270,14 @@
public List<AppVersion> findAppVersion() {
return sysUsersDao.selectAppVersion();
}
+
+ @Override
+ public SysUsers findByOpenId(String openId, Long companyId) {
+ return sysUsersDao.selectUserByOpenId(openId, companyId);
+ }
+
+ @Override
+ public int modifyUserOpenId(String openId, Long suId) {
+ return sysUsersDao.updateUserOpenId(openId, suId);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1