Merge remote-tracking branch 'origin/master'

jiangping

2023-12-15 e0965debdfc7149b9490d66d45c8737ca574ed21

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java

@@ -5,9 +5,9 @@
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.openapi.request.RoleListRequest;
import com.doumee.core.model.openapi.response.DeviceListResponse;
import com.doumee.core.model.openapi.response.RoleListResponse;
import com.doumee.core.erp.model.openapi.request.RoleListRequest;
import com.doumee.core.erp.model.openapi.response.DeviceListResponse;
import com.doumee.core.erp.model.openapi.response.RoleListResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.DeviceMapper;