fix conflict

Helius

2022-02-14 59cf24b0aba393e145f4ba3d58e98b7a01a80992

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

@@ -173,4 +173,7 @@

    public List<AppVersion> findAppVersion();

    SysUsers findByOpenId(String openId, Long companyId);

    int modifyUserOpenId(String openId, Long suId);
}