Explorar o código

Merge branch 'hostfix_v0.1.0' into develop

# Conflicts:
#	dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/controller/ObjectInfoController.java
lijie %!s(int64=3) %!d(string=hai) anos
pai
achega
f2ff2594e3

+ 1 - 1
dmp-business/dmp-rwd/src/main/java/com/persagy/dmp/rwd/define/controller/ObjectInfoController.java

@@ -63,7 +63,7 @@ public class ObjectInfoController {
         ConditionUtil.ensureProjectCriteria(wrapper);
         // 转换查询条件
         QueryCriteriaHelper.toWrapper(wrapper, criteria, ObjectInfoDefine.class);
-        Page page = QueryCriteriaHelper.toPage(criteria);
+        Page<ObjectInfoDefine> page = QueryCriteriaHelper.toPage(criteria);
         // 没有排序条件时,按默认条件排序
         if(CollUtil.isEmpty(page.getOrders())) {
             wrapper.orderByAsc("show_order");