From 981e6a5640a4e9043583e72126c99fc418190f0a Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 7 May 2019 13:56:18 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E7=BD=AE=E9=A1=B6=E6=8E=92=E5=BA=8F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/basic/WxMerchantController.java | 6 +----- .../src/main/java/com/iformall/domain/po/WxMerchant.java | 4 +--- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index 64d4578bd..0d4c8426d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -8,7 +8,6 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.vo.WxMerchantVo; import com.iformall.service.WxMerchantService; -import com.iformall.service.WxProfitSharingReceiverService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -32,9 +31,6 @@ public class WxMerchantController extends BaseController { @Autowired private WxMerchantService wxMerchantService; - @Autowired - private WxProfitSharingReceiverService wxProfitSharingReceiverService; - @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @@ -45,7 +41,7 @@ public class WxMerchantController extends BaseController { logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); if (null == wxMerchant) wxMerchant = new WxMerchant(); wxMerchant.setTenantId(getTenantId()); - wxMerchant.setSortColumns(WxMerchant.Field.Id_DESC); + wxMerchant.setSortColumns(WxMerchant.Field.TopTime_DESC); final PageInfo page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index c1e8a4218..56897deb5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -499,9 +499,7 @@ public class WxMerchant extends BaseEntity { ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") ,CarVendorType_ASC("`car_vendor_type` ASC"),CarVendorType_DESC("`car_vendor_type` DESC") - ,CarParams_ASC("`car_params` ASC"),CarParams_DESC("`car_params` DESC") - ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") - + ,CarParams_ASC("`car_params` ASC"),CarParams_DESC("`car_params` DESC"), Status_ASC("`status` ASC"), Status_DESC("`status` DESC"), TopTime_ASC("`top_time` ASC"), TopTime_DESC("`top_time` DESC") ; private String value; Field(String value){