Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

5 天以前 1bff330017b9fd91ee4a0b93b7484b82cb92ccf4

 server/system_service/src/main/java/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.java

@@ -3,8 +3,8 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.model.Company;