fix conflect

wzy

2021-11-11 8f7460c6ddff45ec39bf2026d75a3f4e2b26f13d

 zq-erp/src/main/java/com/matrix/system/common/service/SysUsersService.java

@@ -173,4 +173,5 @@

    public List<AppVersion> findAppVersion();

    SysUsers findByOpenId(String openId, Long companyId);
}