From b961ec487e6e96248e343c341c5d749eed6959f8 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 15 Mar 2019 13:27:08 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=8E=92=E5=BA=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/domain/vo/WxWeappInfo.java | 8 ++++---- .../com/iformall/controller/WxWeappInfoController.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappInfo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappInfo.java index 9838377..06d360f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxWeappInfo.java @@ -10,11 +10,11 @@ import java.util.List; @Data @EqualsAndHashCode(callSuper = true) public class WxWeappInfo extends WxAuthorizerInfo { - - /**小程序类型(1-B端 2-C端)*/ + + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + private String tenantId; @io.swagger.annotations.ApiModelProperty(value="小程序类型(1-B端 2-C端)",name="type") private Integer type; - /**小程序名称*/ @io.swagger.annotations.ApiModelProperty(value="小程序名称",name="name") private String name; @@ -22,7 +22,6 @@ public class WxWeappInfo extends WxAuthorizerInfo { { Id_ASC("ai.`id` ASC"),Id_DESC("ai.`id` DESC") ,AuthorizerAppid_ASC("ai.`authorizer_appid` ASC"),AuthorizerAppid_DESC("ai.`authorizer_appid` DESC") - ,HeadImg_ASC("ai.`head_img` ASC"),HeadImg_DESC("ai.`head_img` DESC") ,Alias_ASC("ai.`alias` ASC"),Alias_DESC("ai.`alias` DESC") ,QrcodeUrl_ASC("ai.`qrcode_url` ASC"),QrcodeUrl_DESC("ai.`qrcode_url` DESC") @@ -44,6 +43,7 @@ public class WxWeappInfo extends WxAuthorizerInfo { ,OpenAppid_ASC("ai.`open_appid` ASC"),OpenAppid_DESC("ai.`open_appid` DESC") ,BindOpenTime_ASC("ai.`bind_open_time` ASC"),BindOpenTime_DESC("ai.`bind_open_time` DESC") ,Name_ASC("a.`name` ASC"),Name_DESC("a.`name` DESC") + ,TenantID_ASC("a.`tenant_id` ASC"),TenantID_DESC("a.`tenant_id` DESC") ,Type_ASC("a.`type` ASC"),Type_DESC("a.`type` DESC") ; private String value; diff --git a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java index 117ad7c..46183f0 100644 --- a/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java +++ b/mlWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java @@ -96,7 +96,7 @@ public class WxWeappInfoController extends BaseController { weappInfo.setName(null); } } - weappInfo.setSortColumns(WxWeappInfo.Field.Name_ASC,WxWeappInfo.Field.Type_ASC); + weappInfo.setSortColumns(WxWeappInfo.Field.TenantID_ASC,WxWeappInfo.Field.Type_ASC,WxWeappInfo.Field.Name_ASC); final PageInfo page = authorizerInfoService.listVoAsPage(weappInfo, pageNum, pageSize); return new ResultData(page); }