Merge remote-tracking branch 'origin/master'

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

@@ -163,6 +163,10 @@ public class OcpTenantGroupIocnDto {
     @ApiModelProperty(value = "应用调用的服务数量图标数据")
     private Object iocn;
 
+
+    @ApiModelProperty(value = "图片类型")
+    private Object iocnKind;
+
     /**
      * 所属公司可能会根据公司分区
      */
@@ -172,6 +176,15 @@ public class OcpTenantGroupIocnDto {
     @ApiModelProperty("应用状态 '0: ''待审核'',1: ''已审核'',2: ''未通过'', 3: ''未提交'',4:''建设中'',5:''下架'',6:''发布'''")
     private Short tenantState;
 
+
+    public Object getIocnKind() {
+        return iocnKind;
+    }
+
+    public void setIocnKind(Object iocnKind) {
+        this.iocnKind = iocnKind;
+    }
+
     public Short getTenantState() {
         return tenantState;
     }

src/main/java/com/pms/ocp/model/entity/OcpTenantIocn.java

@@ -51,6 +51,18 @@ public class OcpTenantIocn implements Serializable {
     @ApiModelProperty(value = "所属公司可能会根据公司分区")
     private String companyCode;
 
+
+
+
+
+
+
+
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
     private static final long serialVersionUID = 1L;
 
     public String getObjId() {