From 44f9cd5c403584c39c8bb893f69244e4835daab8 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期三, 19 二月 2020 12:13:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 WebService/src/main/java/com/java110/web/components/service/ServiceManageComponent.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/WebService/src/main/java/com/java110/web/components/service/ServiceManageComponent.java b/WebService/src/main/java/com/java110/web/components/service/ServiceManageComponent.java
index c40c819..1af9c8f 100644
--- a/WebService/src/main/java/com/java110/web/components/service/ServiceManageComponent.java
+++ b/WebService/src/main/java/com/java110/web/components/service/ServiceManageComponent.java
@@ -2,6 +2,7 @@
 
 
 import com.java110.core.context.IPageData;
+import com.java110.web.smo.app.IListAppsSMO;
 import com.java110.web.smo.service.IListServicesSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -21,6 +22,9 @@
     @Autowired
     private IListServicesSMO listServicesSMOImpl;
 
+    @Autowired
+    private IListAppsSMO listAppsSMOImpl;
+
     /**
      * 鏌ヨ鏈嶅姟鍒楄〃
      *
@@ -31,6 +35,10 @@
         return listServicesSMOImpl.listServices(pd);
     }
 
+    public ResponseEntity<String> loadApp(IPageData pd){
+        return listAppsSMOImpl.listApps(pd);
+    }
+
     public IListServicesSMO getListServicesSMOImpl() {
         return listServicesSMOImpl;
     }
@@ -38,4 +46,12 @@
     public void setListServicesSMOImpl(IListServicesSMO listServicesSMOImpl) {
         this.listServicesSMOImpl = listServicesSMOImpl;
     }
+
+    public IListAppsSMO getListAppsSMOImpl() {
+        return listAppsSMOImpl;
+    }
+
+    public void setListAppsSMOImpl(IListAppsSMO listAppsSMOImpl) {
+        this.listAppsSMOImpl = listAppsSMOImpl;
+    }
 }

--
Gitblit v1.8.0