Merge remote-tracking branch 'origin/feature/0721-tenant' into feature/0721-tenant

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/TenantApplyRecordWrapper.java

@@ -129,7 +129,8 @@ public class TenantApplyRecordWrapper {
     @AllArgsConstructor
     @ApiModel(" TenantApply-机构历史审核记录")
     public static class TenantApply {
-
+        @ApiModelProperty("id")
+        private Long id;
 
         @ApiModelProperty("机构申请记录id")
         private Integer tenantApplyRecordId;

cooleshow-user/user-biz/src/main/resources/config/mybatis/TenantApplyRecordMapper.xml

@@ -86,6 +86,7 @@
     <select id="queryNow"
             resultType="com.yonge.cooleshow.biz.dal.wrapper.TenantApplyRecordWrapper$TenantApplyRecord">
         select
+        id_ AS id,
         name_ AS name,
         logo_ as logo,
         province_code_ AS provinceCode,