|
|
|
@@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog; |
|
|
|
import com.iformall.common.Result; |
|
|
|
import com.iformall.common.ResultData; |
|
|
|
import com.iformall.controller.base.BaseController; |
|
|
|
import com.iformall.domain.po.BaseEntity; |
|
|
|
import com.iformall.domain.po.WxMerchant; |
|
|
|
import com.iformall.domain.vo.WxMerchantVo; |
|
|
|
import com.iformall.service.WxMerchantService; |
|
|
|
@@ -41,7 +42,7 @@ public class WxMerchantController extends BaseController { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); |
|
|
|
if (null == wxMerchant) wxMerchant = new WxMerchant(); |
|
|
|
wxMerchant.setTenantId(getTenantId()); |
|
|
|
wxMerchant.setSortColumns(WxMerchant.Field.TopTime_DESC); |
|
|
|
wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); |
|
|
|
final PageInfo<WxMerchant> page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); |
|
|
|
return new ResultData(page); |
|
|
|
} |
|
|
|
@@ -56,7 +57,7 @@ public class WxMerchantController extends BaseController { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); |
|
|
|
if (null == wxMerchant) wxMerchant = new WxMerchant(); |
|
|
|
wxMerchant.setTenantId(getTenantId()); |
|
|
|
wxMerchant.setSortColumns(WxMerchant.Field.TopTime_DESC); |
|
|
|
wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); |
|
|
|
final PageInfo<WxMerchant> page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize); |
|
|
|
return new ResultData(page); |
|
|
|
} |
|
|
|
|