Merge remote-tracking branch 'origin/master'

src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java

@@ -21,6 +21,8 @@ public class ApiBaseDto implements Serializable {
     @ApiModelProperty("服务编码")
     private String apiCode;
 
+    @ApiModelProperty("服务名称")
+    private String apiName;
     @ApiModelProperty("服务分类编码")
     private String apiGroupCode;
 
@@ -200,4 +202,20 @@ public class ApiBaseDto implements Serializable {
     public void setApiGroupName(String apiGroupName) {
         this.apiGroupName = apiGroupName;
     }
+
+    public String getApiName() {
+        return apiName;
+    }
+
+    public void setApiName(String apiName) {
+        this.apiName = apiName;
+    }
+
+    public Integer getCurrentPage() {
+        return currentPage;
+    }
+
+    public void setCurrentPage(Integer currentPage) {
+        this.currentPage = currentPage;
+    }
 }

src/main/resources/mapper/ApiDetailsMapper.xml

@@ -6,7 +6,7 @@
 
         select
         oab.obj_id,oab.api_code,oae.api_code,oab.api_name,oae.cluster_name,
-        oae.space_name,oab.api_url,oae.api_state ,oab.api_unit ,oab.api_ctime,oab.api_req,oab.api_resp from ocp_api_base oab
+        oae.space_name,oab.api_url,oae.api_state ,oab.api_unit ,oab.api_ctime,oab.api_req,oab.api_resp,oab.api_description from ocp_api_base oab
         LEFT JOIN ocp_api_extent oae
         on oab.api_code = oae.api_code
         where oab.is_delete = 0