Merge branch 'feature/0721-tenant' of http://git.dayaedu.com/yonge/cooleshow into develop

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/queryInfo/SysMusicCompareRecordQueryInfo.java

@@ -54,6 +54,9 @@ public class SysMusicCompareRecordQueryInfo {
 
         @ApiModelProperty(name = "排序方式")
         private String sortType = "DESC";
+
+        @ApiModelProperty(name = "客户端")
+        private String clientId = "student";
     }
 
     @Data

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

@@ -365,6 +365,9 @@
 			<if test="tenantId != null">
 				AND smcr.tenant_id_ = #{tenantId}
 			</if>
+			<if test="clientId != null and clientId!= ''">
+				AND smcr.client_id_ = #{clientId}
+			</if>
 		</where>
 		group by smcr.user_id_, DATE_FORMAT(create_time_, '%Y-%m-%d')) mprs ON mprs.user_id_ = st.user_id_
 		left join sys_user su ON st.user_id_ = su.id_
@@ -385,6 +388,9 @@
 		left join sys_user su ON st.user_id_ = su.id_
 		LEFT JOIN sys_music_compare_record smcr ON smcr.user_id_ = st.user_id_
 		<where>
+			<if test="clientId != null and clientId!= ''">
+				AND smcr.client_id_ = #{clientId}
+			</if>
 			<if test="tenantId != null">
 				AND smcr.tenant_id_ = #{tenantId}
 			</if>

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/TenantActivationCodeController.java

@@ -195,7 +195,7 @@ public class TenantActivationCodeController extends BaseController {
         }
 
         List<TenantActivationCodeWrapper.ExportTemplate> templates = JSONArray.parseArray(JSON.toJSONString(rows), TenantActivationCodeWrapper.ExportTemplate.class);
-
+        templates.forEach(next->next.setActivationPhone(""));
 
         TenantActivationCodeWrapper.ExportFile exportFile = generateExportExcelFile(templates, TenantActivationCodeWrapper.ExportTemplate.class, "激活码导出", "激活码");
         return succeed(exportFile);