Merge branch 'feature/0721-tenant' into develop

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantInfoServiceImpl.java

@@ -183,7 +183,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoMapper, TenantI
 
         for (TenantInfoWrapper.TenantInfo info : tenantInfos) {
             info.setTeacherCounts(teacherIdCountMap.getOrDefault(info.getId(), 0));
-            info.setTeacherCounts(studentIdCountMap.getOrDefault(info.getId(), 0));
+            info.setStudentCounts(studentIdCountMap.getOrDefault(info.getId(), 0));
         }
 
         //获取省市区信息

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

@@ -103,7 +103,7 @@
                 and t.region_code_ = #{param.regionCode}
             </if>
         </where>
-
+        order by t.create_time_
 	</select>
 
     <select id="queryTeacherCounts" resultType="com.yonge.cooleshow.biz.dal.entity.TeacherCounts">