From 0a9b6e565843bd25e5ef37e979c7da9bbf3df218 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 22 四月 2022 17:06:43 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-bean/src/main/java/com/java110/dto/reportCustomComponent/ReportCustomComponentDto.java |   68 +++++++++++++++++++++------------
 1 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/reportCustomComponent/ReportCustomComponentDto.java b/java110-bean/src/main/java/com/java110/dto/reportCustomComponent/ReportCustomComponentDto.java
index 515e023..07291c4 100644
--- a/java110-bean/src/main/java/com/java110/dto/reportCustomComponent/ReportCustomComponentDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/reportCustomComponent/ReportCustomComponentDto.java
@@ -1,6 +1,7 @@
 package com.java110.dto.reportCustomComponent;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -14,14 +15,17 @@
  **/
 public class ReportCustomComponentDto extends PageDto implements Serializable {
 
+    public static final String QUERY_MODEL_SQL = "1";
+    public static final String QUERY_MODEL_JAVA = "2";
+
     private String componentType;
-private String componentId;
-private String javaScript;
-private String name;
-private String componentGroup;
-private String remark;
-private String queryModel;
-private String sql;
+    private String componentId;
+    private String javaScript;
+    private String name;
+    private String componentGroup;
+    private String remark;
+    private String queryModel;
+    private String componentSql;
 
 
     private Date createTime;
@@ -32,52 +36,66 @@
     public String getComponentType() {
         return componentType;
     }
-public void setComponentType(String componentType) {
+
+    public void setComponentType(String componentType) {
         this.componentType = componentType;
     }
-public String getComponentId() {
+
+    public String getComponentId() {
         return componentId;
     }
-public void setComponentId(String componentId) {
+
+    public void setComponentId(String componentId) {
         this.componentId = componentId;
     }
-public String getJavaScript() {
+
+    public String getJavaScript() {
         return javaScript;
     }
-public void setJavaScript(String javaScript) {
+
+    public void setJavaScript(String javaScript) {
         this.javaScript = javaScript;
     }
-public String getName() {
+
+    public String getName() {
         return name;
     }
-public void setName(String name) {
+
+    public void setName(String name) {
         this.name = name;
     }
-public String getComponentGroup() {
+
+    public String getComponentGroup() {
         return componentGroup;
     }
-public void setComponentGroup(String componentGroup) {
+
+    public void setComponentGroup(String componentGroup) {
         this.componentGroup = componentGroup;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getQueryModel() {
+
+    public String getQueryModel() {
         return queryModel;
     }
-public void setQueryModel(String queryModel) {
+
+    public void setQueryModel(String queryModel) {
         this.queryModel = queryModel;
     }
-public String getSql() {
-        return sql;
-    }
-public void setSql(String sql) {
-        this.sql = sql;
+
+    public String getComponentSql() {
+        return componentSql;
     }
 
+    public void setComponentSql(String componentSql) {
+        this.componentSql = componentSql;
+    }
 
     public Date getCreateTime() {
         return createTime;

--
Gitblit v1.8.0