From 111094ab2783673aa0a19705c39ab322ce6d6815 Mon Sep 17 00:00:00 2001 From: xhxu Date: Sat, 4 Jul 2020 20:09:14 +0800 Subject: [PATCH 1/3] ceshi --- .../java/com/iformall/controller/basic/WxShopController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java index be6b6cce8..e3ce14877 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java @@ -181,7 +181,7 @@ public class WxShopController extends BaseController { wxShop = new WxShop(); } wxShop.updateTenantInfo(getTenantInfo()); - wxShop.setSortColumns(BaseEntity.SortField.SCreateDate_DESC,BaseEntity.SortField.SId_DESC); + //wxShop.setSortColumns(BaseEntity.SortField.SCreateDate_DESC,BaseEntity.SortField.SId_DESC); final PageInfo> page = wxShopService.notRentListMapAsPage(wxShop, pageNum, pageSize); return new ResultData(page); From 28efb0cdeca70c3e4c4fc97169a26089d20c06e2 Mon Sep 17 00:00:00 2001 From: xhxu Date: Sat, 4 Jul 2020 21:23:33 +0800 Subject: [PATCH 2/3] ceshi --- mallinkService/src/main/resources/mapper/WxShopMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index e50fdb8e8..a2d902f84 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -255,7 +255,7 @@ left join wx_mall_floor f on s.floor=f.id where s.is_del=0 - + From 87200b650e002613f4205aa6aa14f2e98bdc7c99 Mon Sep 17 00:00:00 2001 From: xhxu Date: Sat, 4 Jul 2020 21:31:55 +0800 Subject: [PATCH 3/3] ceshi --- mallinkService/src/main/resources/mapper/WxShopMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index a2d902f84..f0653dba5 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -245,7 +245,7 @@ - select s.id as id, s.tenant_id tenantId, s.parent_tenant_id parentTenantId, s.shop_number shopNumber,CONVERT(s.build_area,SIGNED) buildArea, s.img_url imgUrl,CONVERT(s.operation_area,SIGNED) operationArea, s.status,b.building_name building,f.floor_name floor,s.manager,s.manager_phone managerPhone,