Merge remote-tracking branch 'origin/cjl' into dev

cjl

2023-11-02 a0a6f95ec5b92be03385eea83b64bf97fcbfa17e

 screen-api/src/main/java/com/moral/api/mapper/OrganizationMapper.java

@@ -2,6 +2,9 @@

import com.moral.api.entity.Organization;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -13,4 +16,7 @@
 */
public interface OrganizationMapper extends BaseMapper<Organization> {

    List<Integer> orgIdList(@Param("organizationId") Integer organizationId);

    List<Integer> orgIdSpecialDevList(@Param("organizationId") Integer organizationId,@Param("mac") String mac);
}