From 4208d7f9407ab7c9d6b756f5f8a7616b7686fc74 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 17 十一月 2023 12:40:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/bo/CodeTemplateAttrSqlBO.java | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/bo/CodeTemplateAttrSqlBO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/bo/CodeTemplateAttrSqlBO.java
index 188bd00..1cc595b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/bo/CodeTemplateAttrSqlBO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/bo/CodeTemplateAttrSqlBO.java
@@ -1,7 +1,5 @@
package com.vci.ubcs.code.bo;
-import com.vci.starter.web.pagemodel.PageHelper;
-
import java.util.List;
import java.util.Map;
@@ -30,7 +28,7 @@
/**
* 鍒嗛〉瀵硅薄
*/
- private PageHelper pageHelper;
+ //private PageHelper pageHelper;
/**
* 鍖呭惈鍒嗛〉鐨剆ql璇彞
@@ -47,12 +45,25 @@
*/
private String sqlCount;
+ /**
+ * 鏌ヨ閲嶅鏁版嵁鏃舵煡鍑虹紪鐮�
+ */
+ private String sqlId;
+
/**
* 鏈鏌ヨ鐨勫瓧娈�
*/
private List<String> selectFieldList;
- public String getTableName() {
+ public String getSqlId() {
+ return sqlId;
+ }
+
+ public void setSqlId(String sqlId) {
+ this.sqlId = sqlId;
+ }
+
+ public String getTableName() {
return tableName;
}
@@ -76,13 +87,13 @@
this.joinTable = joinTable;
}
- public PageHelper getPageHelper() {
- return pageHelper;
- }
-
- public void setPageHelper(PageHelper pageHelper) {
- this.pageHelper = pageHelper;
- }
+// public PageHelper getPageHelper() {
+// return pageHelper;
+// }
+//
+// public void setPageHelper(PageHelper pageHelper) {
+// this.pageHelper = pageHelper;
+// }
public String getSqlHasPage() {
return sqlHasPage;
@@ -122,7 +133,7 @@
"tableName='" + tableName + '\'' +
", nickName='" + nickName + '\'' +
", joinTable=" + joinTable +
- ", pageHelper=" + pageHelper +
+ //", pageHelper=" + pageHelper +
", sqlHasPage='" + sqlHasPage + '\'' +
", sqlUnPage='" + sqlUnPage + '\'' +
", sqlCount='" + sqlCount + '\'' +
--
Gitblit v1.9.3