From ed6c81a516ec3e7cf942c2844d4f80695850cd04 Mon Sep 17 00:00:00 2001 From: xhxu Date: Sat, 4 Jul 2020 22:07:18 +0800 Subject: [PATCH 01/12] ceshi --- .../com/iformall/controller/basic/WxShopController.java | 2 +- mallinkService/src/main/resources/mapper/WxShopMapper.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) 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 e3ce14877..be6b6cce8 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); diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index f0653dba5..7c444afaa 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, @@ -255,7 +255,7 @@ left join wx_mall_floor f on s.floor=f.id where s.is_del=0 - + From 077f871b46017a9a6354132fd5026d7d0d570185 Mon Sep 17 00:00:00 2001 From: xhxu Date: Sun, 5 Jul 2020 10:32:37 +0800 Subject: [PATCH 02/12] 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 7c444afaa..8ba4cb813 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -248,8 +248,8 @@ - + select s.id as id from wx_shop s left join wx_mall_building b on s.building=b.id left join wx_mall_floor f on s.floor=f.id From 76d01645b564a336d53129a8653a66a77358d5a0 Mon Sep 17 00:00:00 2001 From: xhxu Date: Sun, 5 Jul 2020 10:52:42 +0800 Subject: [PATCH 04/12] 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 8979b3010..020111664 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -246,7 +246,7 @@