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 */