Browse Source

Merge branch 'hostfix_v0.1.0' into develop

lijie 3 years ago
parent
commit
623e454856

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/service/IObjectInfoService.java

@@ -62,7 +62,7 @@ public interface IObjectInfoService {
      * @param queryWrapper 查询条件
      * @return 分页结果
      */
-    Page queryByCondition(Page page, Wrapper<ObjectInfoDefine> queryWrapper);
+    Page<ObjectInfoDefine> queryByCondition(Page<ObjectInfoDefine> page, Wrapper<ObjectInfoDefine> queryWrapper);
 
     /**
      * 新增

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/service/impl/ObjectInfoServiceImpl.java

@@ -82,7 +82,7 @@ public class ObjectInfoServiceImpl implements IObjectInfoService {
     }
 
     @Override
-    public Page queryByCondition(Page page, Wrapper<ObjectInfoDefine> queryWrapper) {
+    public Page<ObjectInfoDefine> queryByCondition(Page<ObjectInfoDefine> page, Wrapper<ObjectInfoDefine> queryWrapper) {
         return dao.selectPage(page, queryWrapper);
     }