Merge remote-tracking branch 'origin/master'

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysEnterpriseMapper.java

@@ -1,10 +0,0 @@
-package com.ruoyi.system.mapper;
-
-import com.ruoyi.system.domain.dto.UserEnterpriseRelation;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-public interface SysEnterpriseMapper {
-    List<UserEnterpriseRelation> getjoinuserEnterpriseRelationList();
-}

ruoyi-system/src/main/resources/mapper/system/SysEnterpriseMapper.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.SysEnterpriseMapper">
-
-
-    <select id="getjoinuserEnterpriseRelationList"
-            resultType="com.ruoyi.system.domain.dto.UserEnterpriseRelation">
-        select ue.enterprise_database_driver,
-               ue.enterprise_database_url,
-               ue.enterprise_database_username,
-               ue.enterprise_database_password
-        from t_sys_enterprise ue
-                 inner join user_enterprise_relation uer on ue.enterprise_openid = uer.enterprise_open_id
-        where ue.factory_status = 1
-    </select>
-</mapper>