Merge remote-tracking branch 'origin/master'

aijinhui

2023-09-12 61c0c3ccae4c23a90c405d7ac1cb49f7d5ee0479

 ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyUserMapper.java

@@ -3,7 +3,9 @@
import java.util.List;
import java.util.Map;

import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.sy.domain.ArdSyUser;
import org.apache.ibatis.annotations.MapKey;

/**
 * 三一车辆用户Mapper接口
@@ -69,4 +71,13 @@
     *
     */
    public List<ArdSyUser> getArdSyUserAll();

    /**
     * 查询未挂接三一车辆的4.0用户
     */
    public List<SysUser> getSysUserNoSY();

    ArdSyUser userById(String id);

    public List<ArdSyUser> selectSyUser();
}