Merge branch 'feature/0721-tenant' into develop

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

@@ -110,7 +110,7 @@ public class TenantActivationCodeController extends BaseController {
             instance.set(Calendar.HOUR_OF_DAY, 23);
             instance.set(Calendar.MINUTE, 59);
             instance.set(Calendar.MILLISECOND, 59);
-            query.setActivationEndTime(parse);
+            query.setActivationEndTime(instance.getTime());
         }
         IPage<TenantActivationCodeWrapper.TenantActivationCode> pages =
                 tenantActivationCodeService.selectPage(QueryInfo.getPage(query), query);