From bfce748e37a753c729e15dd233600379f504d019 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 28 四月 2022 13:59:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingEquipmentService.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingEquipmentService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingEquipmentService.java
index 91f6b89..6c6a944 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingEquipmentService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingEquipmentService.java
@@ -1,5 +1,7 @@
 package com.sandu.ximon.admin.service;
 
+import com.github.pagehelper.PageHelper;
+import com.sandu.common.object.BaseConditionVO;
 import com.sandu.common.service.impl.BaseServiceImpl;
 import com.sandu.ximon.admin.manager.iot.rrpc.enums.LightPoleHeelingEnum;
 import com.sandu.ximon.admin.security.SecurityUtils;
@@ -39,7 +41,8 @@
      *
      * @return
      */
-    public List<LightPoleHeelingEquipmentBo> LightPoleHeelingEquipmentList() {
+    public List<LightPoleHeelingEquipmentBo> LightPoleHeelingEquipmentList(BaseConditionVO baseConditionVO) {
+        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
         //涓虹┖鏄秴绠�
         List<LightPoleHeelingEquipmentBo> lightPoleHeelingEquipmentBos;
         if (SecurityUtils.getClientId() == null) {

--
Gitblit v1.9.3