fix conflict

Helius

2022-02-14 59cf24b0aba393e145f4ba3d58e98b7a01a80992

 zq-erp/src/main/java/com/matrix/system/common/dao/SysUsersDao.java

@@ -126,4 +126,6 @@
    public List<AppVersion> selectAppVersion();

    SysUsers selectUserByOpenId(@Param("openId") String openId, @Param("companyId") Long companyId);

    int updateUserOpenId(@Param("openId") String openId, @Param("suId") Long suId);
}