Merge branch 'feature/0721-tenant' into develop

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

@@ -74,6 +74,8 @@ public class TenantAlbumPurchaseWrapper {
         @ApiModelProperty("机构专辑名称")
         private String tenantAlbumName;
 
+        @ApiModelProperty("机构专辑图片")
+        private String tenantAlbumImg;
         @ApiModelProperty("采购时间")
         private Date purchaseTime;
 

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

@@ -22,7 +22,7 @@
     <select id="selectPage"
             resultType="com.yonge.cooleshow.biz.dal.wrapper.TenantAlbumPurchaseWrapper$TenantAlbumPurchase">
         SELECT
-        <include refid="baseColumns"/>,ta.name_ as tenantAlbumName
+        <include refid="baseColumns"/>,ta.name_ as tenantAlbumName,ta.cover_img_ as tenantAlbumImg
         FROM tenant_album_purchase t
         LEFT JOIN tenant_album ta on t.tenant_album_id_ = ta.id_
         <choose>