From 583d0c0d31f3de2ae87043660706cfa0cb8f1126 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 17 七月 2025 17:52:02 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GovernmentCloudOtherController.java |   30 ++++++++++++++++++++----------
 1 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GovernmentCloudOtherController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GovernmentCloudOtherController.java
index b6c13cd..1480907 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GovernmentCloudOtherController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GovernmentCloudOtherController.java
@@ -80,41 +80,51 @@
                 .list();
         List<TActivity> list2 = activityService.lambdaQuery()
                 .ge(TActivity::getCreateTime,start)
-                .le(TActivity::getCreateTime,end)                .list();
+                .le(TActivity::getCreateTime,end)
+                .list();
         List<TAdvertising> list3 = advertisingService.lambdaQuery()
                 .ge(TAdvertising::getCreateTime,start)
-                .le(TAdvertising::getCreateTime,end)                .list();
+                .le(TAdvertising::getCreateTime,end)
+                .list();
         List<TCompany> list4 = companyService.lambdaQuery()
                 .ge(TCompany::getCreateTime,start)
-                .le(TCompany::getCreateTime,end)                .list();
+                .le(TCompany::getCreateTime,end)
+                .list();
         List<TCoupon> list5 = couponService.lambdaQuery()
                 .ge(TCoupon::getCreateTime,start)
-                .le(TCoupon::getCreateTime,end)                .list();
+                .le(TCoupon::getCreateTime,end)
+                .list();
         List<TEnterpriseUserApplication> list6 = enterpriseUserApplicationService.lambdaQuery()
                 .ge(TEnterpriseUserApplication::getCreateTime,start)
-                .le(TEnterpriseUserApplication::getCreateTime,end)                .list();
+                .le(TEnterpriseUserApplication::getCreateTime,end)
+                .list();
         List<TEvaluationTag> list7 = evaluationTagService.lambdaQuery()
                 .ge(TEvaluationTag::getCreateTime,start)
-                .le(TEvaluationTag::getCreateTime,end)                .list();
+                .le(TEvaluationTag::getCreateTime,end)
+                .list();
         List<TGoods> list8 = goodsService.lambdaQuery()
                 .ge(TGoods::getCreateTime,start)
-                .le(TGoods::getCreateTime,end)                .list();
+                .le(TGoods::getCreateTime,end)
+                .list();
         List<THtml> list9 = htmlService.lambdaQuery()
                 .list();
         List<TIntegralRule> list10 = integralRuleService.lambdaQuery()
                 .list();
         List<TInvoiceType> list11 = invoiceTypeService.lambdaQuery()
                 .ge(TInvoiceType::getCreateTime,start)
-                .le(TInvoiceType::getCreateTime,end)                .list();
+                .le(TInvoiceType::getCreateTime,end)
+                .list();
         List<TNotice> list12 = noticeService.lambdaQuery()
                 .ge(TNotice::getCreateTime,start)
-                .le(TNotice::getCreateTime,end)                .list();
+                .le(TNotice::getCreateTime,end)
+                .list();
         List<TRoleSite> list13 = roleSiteService.lambdaQuery().list();
         List<TSystemConfiguration> list14 = systemConfigurationService.lambdaQuery().list();
         List<TUserSite> list15 = userSiteService.lambdaQuery().list();
         List<TUserTag> list16 = userTagService.lambdaQuery()
                 .ge(TUserTag::getCreateTime,start)
-                .le(TUserTag::getCreateTime,end)                .list();
+                .le(TUserTag::getCreateTime,end)
+                .list();
         List<TVip> list17 = vipService.lambdaQuery()
                 .ge(TVip::getCreateTime,start)
                 .le(TVip::getCreateTime,end)

--
Gitblit v1.7.1