Преглед изворни кода

[商户][修改][置顶排序]

release_toaliyun_real
gongbiao пре 7 година
родитељ
комит
981e6a5640
2 измењених фајлова са 2 додато и 8 уклоњено
  1. +1
    -5
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java
  2. +1
    -3
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java

+ 1
- 5
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<WxMerchant> page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize);
return new ResultData(page);
}


+ 1
- 3
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){


Loading…
Откажи
Сачувај