From b676b4c37f8fc4f0e1cb8bb3b219b1d86185175f Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 01 四月 2025 16:55:33 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/BasicTable.vue | 2 --
north-glass-erp/src/main/java/com/example/erp/config/StpInterfaceImpl.java | 2 --
north-glass-erp/src/main/resources/application.yml | 3 +++
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/BasicTable.vue b/north-glass-erp/northglass-erp/src/components/BasicTable.vue
index 1744a32..8244a59 100644
--- a/north-glass-erp/northglass-erp/src/components/BasicTable.vue
+++ b/north-glass-erp/northglass-erp/src/components/BasicTable.vue
@@ -139,8 +139,6 @@
gridOptions.columns = props.childrenData.columns
getReportData()
addListener(xGrid.value,gridOptions)
-
-
})
function filterChanged(column){
//gridOptions.loading=true
diff --git a/north-glass-erp/src/main/java/com/example/erp/config/StpInterfaceImpl.java b/north-glass-erp/src/main/java/com/example/erp/config/StpInterfaceImpl.java
index de38cd4..1e5386d 100644
--- a/north-glass-erp/src/main/java/com/example/erp/config/StpInterfaceImpl.java
+++ b/north-glass-erp/src/main/java/com/example/erp/config/StpInterfaceImpl.java
@@ -11,8 +11,6 @@
/**
* 鑷畾涔夋潈闄愯璇佹帴鍙ｆ墿灞曪紝Sa-Token 灏嗕粠姝ゅ疄鐜扮被鑾峰彇姣忎釜璐﹀彿鎷ユ湁鐨勬潈闄愮爜
*
- * @author kong
- * @since 2022-10-13
*/
diff --git a/north-glass-erp/src/main/resources/application.yml b/north-glass-erp/src/main/resources/application.yml
index fce62a7..fa7851d 100644
--- a/north-glass-erp/src/main/resources/application.yml
+++ b/north-glass-erp/src/main/resources/application.yml
@@ -5,6 +5,9 @@
ip: localhost
port: 3306
+#sa-token:
+# timeout: 86400
+
spring:
datasource:
--
Gitblit v1.8.0