From 4d086834c255219efe24a6cc0f185adebc6f90ad Mon Sep 17 00:00:00 2001 From: hupeng Date: Wed, 24 Jul 2019 17:19:12 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BB=A3=E7=A0=81][=E8=B0=83=E6=95=B4]:?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=86=97=E4=BD=99=E7=9A=84=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/basic/WxMerchantController.java | 2 +- .../java/com/iformall/controller/basic/WxBrandController.java | 2 -- 2 files changed, 1 insertion(+), 3 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 32f32a95f..2cb8312a0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -213,7 +213,7 @@ public class WxMerchantController extends BaseController { @SystemControllerLog(description = "商户-商户数据导出") public void exportData(@ModelAttribute WxMerchant wxMerchant, HttpServletRequest request, HttpServletResponse response) { wxMerchant.setTenantId(getTenantId()); - wxMerchant.setSortColumns(WxMerchant.Field.TopTime_DESC); + wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); wxMerchantService.exportData(wxMerchant,request,response); } diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java index 50ded68c6..534f634d7 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java @@ -18,8 +18,6 @@ import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; -import static com.iformall.domain.po.WxBrand.Field.Id_DESC; - /** * @author gongbiao */