Merge remote-tracking branch 'origin/master'

jiangping

2023-12-22 22a00c47589ded6699a563690ee5545b73eaca01

 server/dmvisit_service/src/main/java/com/doumee/service/business/DeviceRoleService.java

@@ -2,8 +2,8 @@

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.RoleListResponse;
import com.doumee.core.erp.model.openapi.request.RoleListRequest;
import com.doumee.core.erp.model.openapi.response.RoleListResponse;
import com.doumee.dao.business.model.DeviceRole;
import com.doumee.dao.web.response.DeviceRoleVO;